@@ -140,12 +140,12 @@ |
||
| 140 | 140 | return __( 'Payload processed', 'writing-on-github' ); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - /** |
|
| 144 | - * Do compare |
|
| 145 | - * @param Writing_On_GitHub_File_Info[] $files |
|
| 146 | - * @param int[] &$delete_ids |
|
| 147 | - * @return string|WP_Error |
|
| 148 | - */ |
|
| 143 | + /** |
|
| 144 | + * Do compare |
|
| 145 | + * @param Writing_On_GitHub_File_Info[] $files |
|
| 146 | + * @param int[] &$delete_ids |
|
| 147 | + * @return string|WP_Error |
|
| 148 | + */ |
|
| 149 | 149 | protected function compare( $files, &$delete_ids ) { |
| 150 | 150 | if ( is_wp_error( $files ) ) { |
| 151 | 151 | return $files; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * |
| 23 | 23 | * @param Writing_On_GitHub $app Application container. |
| 24 | 24 | */ |
| 25 | - public function __construct( Writing_On_GitHub $app ) { |
|
| 25 | + public function __construct(Writing_On_GitHub $app) { |
|
| 26 | 26 | $this->app = $app; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -70,21 +70,21 @@ discard block |
||
| 70 | 70 | // return __( 'Payload processed', 'writing-on-github' ); |
| 71 | 71 | // } |
| 72 | 72 | |
| 73 | - public function payload( Writing_On_GitHub_Payload $payload ) { |
|
| 73 | + public function payload(Writing_On_GitHub_Payload $payload) { |
|
| 74 | 74 | |
| 75 | - $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() ); |
|
| 75 | + $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id()); |
|
| 76 | 76 | |
| 77 | - if ( is_wp_error( $result ) ) { |
|
| 77 | + if (is_wp_error($result)) { |
|
| 78 | 78 | return $result; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $result = $this->import_files( $result ); |
|
| 81 | + $result = $this->import_files($result); |
|
| 82 | 82 | |
| 83 | - if ( is_wp_error( $result ) ) { |
|
| 83 | + if (is_wp_error($result)) { |
|
| 84 | 84 | return $files; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - return __( 'Payload processed', 'writing-on-github' ); |
|
| 87 | + return __('Payload processed', 'writing-on-github'); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
@@ -92,23 +92,23 @@ discard block |
||
| 92 | 92 | * @param array $files [Writing_On_GitHub_File_Info] |
| 93 | 93 | * @return string|WP_ERROR |
| 94 | 94 | */ |
| 95 | - protected function import_files( $files ) { |
|
| 95 | + protected function import_files($files) { |
|
| 96 | 96 | |
| 97 | - $error = false; |
|
| 97 | + $error = false; |
|
| 98 | 98 | $delete_ids = false; |
| 99 | 99 | |
| 100 | - $result = $this->compare( $files, $delete_ids ); |
|
| 100 | + $result = $this->compare($files, $delete_ids); |
|
| 101 | 101 | |
| 102 | - if ( is_wp_error( $result ) ) { |
|
| 102 | + if (is_wp_error($result)) { |
|
| 103 | 103 | return $result; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if ( $delete_ids ) { |
|
| 106 | + if ($delete_ids) { |
|
| 107 | 107 | foreach ($delete_ids as $id) { |
| 108 | - $result = $this->app->database()->delete_post( $id ); |
|
| 109 | - if ( is_wp_error( $result ) ) { |
|
| 110 | - if ( $error ) { |
|
| 111 | - $error->add( $result->get_error_code(), $result->get_error_message() ); |
|
| 108 | + $result = $this->app->database()->delete_post($id); |
|
| 109 | + if (is_wp_error($result)) { |
|
| 110 | + if ($error) { |
|
| 111 | + $error->add($result->get_error_code(), $result->get_error_message()); |
|
| 112 | 112 | } else { |
| 113 | 113 | $error = $result; |
| 114 | 114 | } |
@@ -127,17 +127,17 @@ discard block |
||
| 127 | 127 | public function master() { |
| 128 | 128 | $result = $this->app->api()->fetch()->tree_recursive(); |
| 129 | 129 | |
| 130 | - if ( is_wp_error( $result ) ) { |
|
| 130 | + if (is_wp_error($result)) { |
|
| 131 | 131 | return $result; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - $result = $this->import_files( $result ); |
|
| 134 | + $result = $this->import_files($result); |
|
| 135 | 135 | |
| 136 | - if ( is_wp_error( $result ) ) { |
|
| 136 | + if (is_wp_error($result)) { |
|
| 137 | 137 | return $result; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - return __( 'Payload processed', 'writing-on-github' ); |
|
| 140 | + return __('Payload processed', 'writing-on-github'); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | * @param int[] &$delete_ids |
| 147 | 147 | * @return string|WP_Error |
| 148 | 148 | */ |
| 149 | - protected function compare( $files, &$delete_ids ) { |
|
| 150 | - if ( is_wp_error( $files ) ) { |
|
| 149 | + protected function compare($files, &$delete_ids) { |
|
| 150 | + if (is_wp_error($files)) { |
|
| 151 | 151 | return $files; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -156,62 +156,62 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $idsmap = array(); |
| 158 | 158 | |
| 159 | - foreach ( $files as $file ) { |
|
| 160 | - if ( ! $this->importable_file( $file ) ) { |
|
| 159 | + foreach ($files as $file) { |
|
| 160 | + if ( ! $this->importable_file($file)) { |
|
| 161 | 161 | continue; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $blob = $this->app->api()->fetch()->blob( $file ); |
|
| 164 | + $blob = $this->app->api()->fetch()->blob($file); |
|
| 165 | 165 | // network error ? |
| 166 | - if ( is_wp_error( $blob ) ) { |
|
| 166 | + if (is_wp_error($blob)) { |
|
| 167 | 167 | continue; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - if ( $this->importable_raw_file( $blob ) ) { |
|
| 171 | - $this->import_raw_file( $blob, $file->status == 'removed' ); |
|
| 170 | + if ($this->importable_raw_file($blob)) { |
|
| 171 | + $this->import_raw_file($blob, $file->status == 'removed'); |
|
| 172 | 172 | continue; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if ( ! $this->importable_blob( $blob ) ) { |
|
| 175 | + if ( ! $this->importable_blob($blob)) { |
|
| 176 | 176 | continue; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - $post = $this->blob_to_post( $blob ); |
|
| 179 | + $post = $this->blob_to_post($blob); |
|
| 180 | 180 | |
| 181 | - if ( $file->status == 'removed' ) { |
|
| 182 | - if ( $blob->id() ) { |
|
| 181 | + if ($file->status == 'removed') { |
|
| 182 | + if ($blob->id()) { |
|
| 183 | 183 | $idsmap[$blob->id()] = true; |
| 184 | 184 | } |
| 185 | - } elseif ( $post != false ) { |
|
| 185 | + } elseif ($post != false) { |
|
| 186 | 186 | $posts[] = $post; |
| 187 | - if ( $post->is_new() ) { |
|
| 187 | + if ($post->is_new()) { |
|
| 188 | 188 | $new[] = $post; |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - foreach ( $posts as $post ) { |
|
| 194 | - if ( $post->id() && isset( $idsmap[ $post->id() ] ) ) { |
|
| 195 | - unset( $idsmap[$post->id() ] ); |
|
| 193 | + foreach ($posts as $post) { |
|
| 194 | + if ($post->id() && isset($idsmap[$post->id()])) { |
|
| 195 | + unset($idsmap[$post->id()]); |
|
| 196 | 196 | } |
| 197 | 197 | } |
| 198 | 198 | $delete_ids = array(); |
| 199 | - foreach ( $idsmap as $id => $value ) { |
|
| 199 | + foreach ($idsmap as $id => $value) { |
|
| 200 | 200 | $delete_ids[] = $id; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | // $this->app->database()->save_posts( $posts, $commit->author_email() ); |
| 204 | 204 | |
| 205 | - $result = $this->app->database()->save_posts( $posts ); |
|
| 205 | + $result = $this->app->database()->save_posts($posts); |
|
| 206 | 206 | |
| 207 | - if ( is_wp_error( $result ) ) { |
|
| 207 | + if (is_wp_error($result)) { |
|
| 208 | 208 | return $result; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if ( $new ) { |
|
| 212 | - $result = $this->app->export()->new_posts( $new ); |
|
| 211 | + if ($new) { |
|
| 212 | + $result = $this->app->export()->new_posts($new); |
|
| 213 | 213 | |
| 214 | - if ( is_wp_error( $result ) ) { |
|
| 214 | + if (is_wp_error($result)) { |
|
| 215 | 215 | return $result; |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -226,12 +226,12 @@ discard block |
||
| 226 | 226 | * |
| 227 | 227 | * @return bool |
| 228 | 228 | */ |
| 229 | - protected function importable_file( Writing_On_GitHub_File_Info $file ) { |
|
| 229 | + protected function importable_file(Writing_On_GitHub_File_Info $file) { |
|
| 230 | 230 | |
| 231 | 231 | // only _pages and _posts |
| 232 | - if ( strncasecmp($file->path, '_pages/', strlen('_pages/') ) != 0 && |
|
| 233 | - strncasecmp($file->path, '_posts/', strlen('_posts/') ) != 0 && |
|
| 234 | - strncasecmp($file->path, 'images/', strlen('images/') ) != 0 ) { |
|
| 232 | + if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 && |
|
| 233 | + strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0 && |
|
| 234 | + strncasecmp($file->path, 'images/', strlen('images/')) != 0) { |
|
| 235 | 235 | return false; |
| 236 | 236 | } |
| 237 | 237 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * @return bool |
| 252 | 252 | */ |
| 253 | - protected function importable_blob( Writing_On_GitHub_Blob $blob ) { |
|
| 253 | + protected function importable_blob(Writing_On_GitHub_Blob $blob) { |
|
| 254 | 254 | // global $wpdb; |
| 255 | 255 | |
| 256 | 256 | // // Skip the repo's readme. |
@@ -263,20 +263,20 @@ discard block |
||
| 263 | 263 | // return false; |
| 264 | 264 | // } |
| 265 | 265 | |
| 266 | - if ( ! $blob->has_frontmatter() ) { |
|
| 266 | + if ( ! $blob->has_frontmatter()) { |
|
| 267 | 267 | return false; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | return true; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) { |
|
| 274 | - if ( $blob->has_frontmatter() ) { |
|
| 273 | + protected function importable_raw_file(Writing_On_GitHub_Blob $blob) { |
|
| 274 | + if ($blob->has_frontmatter()) { |
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | // only images |
| 279 | - if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) { |
|
| 279 | + if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) { |
|
| 280 | 280 | return false; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -288,16 +288,16 @@ discard block |
||
| 288 | 288 | * @param Writing_On_GitHub_Blob $blob |
| 289 | 289 | * @param bool $is_remove |
| 290 | 290 | */ |
| 291 | - protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) { |
|
| 291 | + protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) { |
|
| 292 | 292 | $arr = wp_upload_dir(); |
| 293 | 293 | $path = $arr['basedir'] . '/writing-on-github/' . $blob->path(); |
| 294 | - if ( $is_remove ) { |
|
| 295 | - if ( file_exists($path) ) { |
|
| 294 | + if ($is_remove) { |
|
| 295 | + if (file_exists($path)) { |
|
| 296 | 296 | unlink($path); |
| 297 | 297 | } |
| 298 | 298 | } else { |
| 299 | 299 | $dirname = dirname($path); |
| 300 | - if ( ! file_exists($dirname) ) { |
|
| 300 | + if ( ! file_exists($dirname)) { |
|
| 301 | 301 | wp_mkdir_p($dirname); |
| 302 | 302 | } |
| 303 | 303 | |
@@ -312,57 +312,57 @@ discard block |
||
| 312 | 312 | * |
| 313 | 313 | * @return Writing_On_GitHub_Post |
| 314 | 314 | */ |
| 315 | - protected function blob_to_post( Writing_On_GitHub_Blob $blob ) { |
|
| 316 | - $args = array( 'post_content' => $blob->content_import() ); |
|
| 315 | + protected function blob_to_post(Writing_On_GitHub_Blob $blob) { |
|
| 316 | + $args = array('post_content' => $blob->content_import()); |
|
| 317 | 317 | $meta = $blob->meta(); |
| 318 | 318 | |
| 319 | 319 | $id = false; |
| 320 | 320 | |
| 321 | - if ( $meta ) { |
|
| 322 | - if ( array_key_exists( 'layout', $meta ) ) { |
|
| 321 | + if ($meta) { |
|
| 322 | + if (array_key_exists('layout', $meta)) { |
|
| 323 | 323 | $args['post_type'] = $meta['layout']; |
| 324 | - unset( $meta['layout'] ); |
|
| 324 | + unset($meta['layout']); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | - if ( array_key_exists( 'published', $meta ) ) { |
|
| 327 | + if (array_key_exists('published', $meta)) { |
|
| 328 | 328 | $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft'; |
| 329 | - unset( $meta['published'] ); |
|
| 329 | + unset($meta['published']); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - if ( array_key_exists( 'post_title', $meta ) ) { |
|
| 332 | + if (array_key_exists('post_title', $meta)) { |
|
| 333 | 333 | $args['post_title'] = $meta['post_title']; |
| 334 | - unset( $meta['post_title'] ); |
|
| 334 | + unset($meta['post_title']); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | - if ( array_key_exists( 'post_name', $meta ) ) { |
|
| 337 | + if (array_key_exists('post_name', $meta)) { |
|
| 338 | 338 | $args['post_name'] = $meta['post_name']; |
| 339 | - unset( $meta['post_name'] ); |
|
| 339 | + unset($meta['post_name']); |
|
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - if ( array_key_exists( 'ID', $meta ) ) { |
|
| 342 | + if (array_key_exists('ID', $meta)) { |
|
| 343 | 343 | $id = $args['ID'] = $meta['ID']; |
| 344 | 344 | $blob->set_id($id); |
| 345 | - unset( $meta['ID'] ); |
|
| 345 | + unset($meta['ID']); |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | $meta['_wogh_sha'] = $blob->sha(); |
| 350 | 350 | |
| 351 | - if ( $id ) { |
|
| 352 | - $old_sha = get_post_meta( $id, '_wogh_sha', true ); |
|
| 353 | - $old_github_path = get_post_meta( $id, '_wogh_github_path', true ); |
|
| 351 | + if ($id) { |
|
| 352 | + $old_sha = get_post_meta($id, '_wogh_sha', true); |
|
| 353 | + $old_github_path = get_post_meta($id, '_wogh_github_path', true); |
|
| 354 | 354 | |
| 355 | 355 | // dont save post when has same sha |
| 356 | - if ( $old_sha && $old_sha == $meta['_wogh_sha'] && |
|
| 357 | - $old_github_path && $old_github_path == $blob->path() ) { |
|
| 356 | + if ($old_sha && $old_sha == $meta['_wogh_sha'] && |
|
| 357 | + $old_github_path && $old_github_path == $blob->path()) { |
|
| 358 | 358 | return false; |
| 359 | 359 | } |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $post = new Writing_On_GitHub_Post( $args, $this->app->api() ); |
|
| 363 | - $post->set_old_github_path( $blob->path() ); |
|
| 364 | - $post->set_meta( $meta ); |
|
| 365 | - $blob->set_id( $post->id() ); |
|
| 362 | + $post = new Writing_On_GitHub_Post($args, $this->app->api()); |
|
| 363 | + $post->set_old_github_path($blob->path()); |
|
| 364 | + $post->set_meta($meta); |
|
| 365 | + $blob->set_id($post->id()); |
|
| 366 | 366 | |
| 367 | 367 | return $post; |
| 368 | 368 | } |