litefeel / writing-on-github

lib/import.php

Indentation +327 added lines, -327 removed lines

@@ -10,331 +10,331 @@
  */
 class Writing_On_GitHub_Import {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Initializes a new import manager.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Imports a payload.
-     * @param  Writing_On_GitHub_Payload $payload
-     *
-     * @return string|WP_Error
-     */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
-
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            return $files;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * import blob by files
-     * @param  Writing_On_GitHub_File_Info[] $files
-     * @param  boolean $force
-     *
-     * @return true|WP_Error
-     */
-    protected function import_files( $files, $force = false ) {
-
-        $error = true;
-
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
-                continue;
-            }
-
-            $blob = $this->app->api()->fetch()->blob( $file );
-            // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
-                continue;
-            }
-
-            $is_remove = 'removed' == $file->status;
-
-            $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                if ( $is_remove ) {
-                    $result = $this->delete_post( $blob );
-                } else {
-                    $result = $this->import_post( $blob, $force );
-                }
-            }
-
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        return $error;
-    }
-
-    /**
-     * Imports the latest commit on the master branch.
-     *
-     * @param  boolean $force
-     * @return string|WP_Error
-     */
-    public function master( $force = false ) {
-        $result = $this->app->api()->fetch()->tree_recursive();
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result, $force );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_File_Info $file
-     *
-     * @return bool
-     */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
-
-        $path = $file->path;
-
-        // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
-        foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to validate.
-     *
-     * @return bool
-     */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
-        // global $wpdb;
-
-        // // Skip the repo's readme.
-        // if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
-        //  return false;
-        // }
-
-        // // If the blob sha already matches a post, then move on.
-        // if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
-        //  return false;
-        // }
-
-        if ( ! $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete post
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return WP_Error|bool
-     */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
-        $id = $blob->id();
-        if ( empty( $id ) ) {
-            return false;
-        }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-        return true;
-    }
-
-    /**
-     * Imports a post into wordpress
-     * @param  Writing_On_GitHub_Blob $blob
-     * @param  boolean                $force
-     * @return WP_Error|bool
-     */
-    protected function import_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $post = $this->blob_to_post( $blob, $force );
-
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
-            return false;
-        }
-
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
-            /** @var WP_Error $result */
-            return $result;
-        }
-
-        if ( $post->is_new() ||
-                ! wogh_equal_path( $post, $blob ) ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
-
-            $result = $this->app->export()->export_post( $post );
-
-            if ( is_wp_error( $result ) ) {
-                /** @var WP_Error $result */
-                return $result;
-            }
-        }
-
-        clean_post_cache( $post->id() );
-
-        return true;
-    }
-
-    /**
-     * import raw file
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return bool
-     */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Imports a raw file content into file system.
-     * @param  Writing_On_GitHub_Blob $blob
-     * @param  bool                   $is_remove
-     */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
-        $arr = wp_upload_dir();
-        $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-        if ( $is_remove ) {
-            if ( file_exists($path) ) {
-                unlink($path);
-            }
-        } else {
-            $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
-                wp_mkdir_p($dirname);
-            }
-
-            file_put_contents($path, $blob->content());
-        }
-        return true;
-    }
-
-    /**
-     * Imports a single blob content into matching post.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
-     * @param boolean                $force
-     *
-     * @return Writing_On_GitHub_Post|false
-     */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $args = array( 'post_content' => $blob->content_import() );
-        $meta = $blob->meta();
-
-        $id = false;
-
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
-                $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
-            }
-
-            if ( array_key_exists( 'published', $meta ) ) {
-                $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
-            }
-
-            if ( array_key_exists( 'post_title', $meta ) ) {
-                $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
-            }
-
-            if ( array_key_exists( 'post_name', $meta ) ) {
-                $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
-            }
-
-            if ( array_key_exists( 'ID', $meta ) ) {
-                $id = $args['ID'] = $meta['ID'];
-                $blob->set_id( $id );
-                unset( $meta['ID'] );
-            }
-
-            if ( array_key_exists( 'post_date', $meta ) ) {
-                if ( empty( $meta['post_date'] ) ) {
-                    $meta['post_date'] = current_time( 'mysql' );
-                }
-
-                $args['post_date'] = $meta['post_date'];
-                unset( $meta['post_date'] );
-            }
-        }
-
-        $meta['_wogh_sha'] = $blob->sha();
-
-        if ( ! $force && $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
-
-            // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
-                return false;
-            }
-        }
-
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $post->set_blob( $blob );
-        $blob->set_id( $post->id() );
-
-        return $post;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Initializes a new import manager.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Imports a payload.
+	 * @param  Writing_On_GitHub_Payload $payload
+	 *
+	 * @return string|WP_Error
+	 */
+	public function payload( Writing_On_GitHub_Payload $payload ) {
+
+		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			return $files;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * import blob by files
+	 * @param  Writing_On_GitHub_File_Info[] $files
+	 * @param  boolean $force
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function import_files( $files, $force = false ) {
+
+		$error = true;
+
+		foreach ( $files as $file ) {
+			if ( ! $this->importable_file( $file ) ) {
+				continue;
+			}
+
+			$blob = $this->app->api()->fetch()->blob( $file );
+			// network error ?
+			if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+				continue;
+			}
+
+			$is_remove = 'removed' == $file->status;
+
+			$result = false;
+			if ( $this->importable_raw_file( $blob ) ) {
+				$result = $this->import_raw_file( $blob, $is_remove );
+			} elseif ( $this->importable_post( $blob ) ) {
+				if ( $is_remove ) {
+					$result = $this->delete_post( $blob );
+				} else {
+					$result = $this->import_post( $blob, $force );
+				}
+			}
+
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Imports the latest commit on the master branch.
+	 *
+	 * @param  boolean $force
+	 * @return string|WP_Error
+	 */
+	public function master( $force = false ) {
+		$result = $this->app->api()->fetch()->tree_recursive();
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result, $force );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_File_Info $file
+	 *
+	 * @return bool
+	 */
+	protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+
+		$path = $file->path;
+
+		// only _pages, _posts and images
+		$prefixs = array( '_pages/', '_posts/', 'images/');
+		foreach ($prefixs as $prefix) {
+			if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to validate.
+	 *
+	 * @return bool
+	 */
+	protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+		// global $wpdb;
+
+		// // Skip the repo's readme.
+		// if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
+		//  return false;
+		// }
+
+		// // If the blob sha already matches a post, then move on.
+		// if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
+		//  return false;
+		// }
+
+		if ( ! $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete post
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return WP_Error|bool
+	 */
+	protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+		$id = $blob->id();
+		if ( empty( $id ) ) {
+			return false;
+		}
+		$result = $this->app->database()->delete_post( $id );
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a post into wordpress
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @param  boolean                $force
+	 * @return WP_Error|bool
+	 */
+	protected function import_post( Writing_On_GitHub_Blob $blob, $force = false ) {
+		$post = $this->blob_to_post( $blob, $force );
+
+		if ( ! $post instanceof Writing_On_GitHub_Post ) {
+			return false;
+		}
+
+		$result = $this->app->database()->save_post( $post );
+		if ( is_wp_error( $result ) ) {
+			/** @var WP_Error $result */
+			return $result;
+		}
+
+		if ( $post->is_new() ||
+				! wogh_equal_path( $post, $blob ) ||
+				! wogh_equal_front_matter( $post, $blob ) ) {
+
+			$result = $this->app->export()->export_post( $post );
+
+			if ( is_wp_error( $result ) ) {
+				/** @var WP_Error $result */
+				return $result;
+			}
+		}
+
+		clean_post_cache( $post->id() );
+
+		return true;
+	}
+
+	/**
+	 * import raw file
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return bool
+	 */
+	protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
+		if ( $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		// only images
+		if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Imports a raw file content into file system.
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @param  bool                   $is_remove
+	 */
+	protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+		$arr = wp_upload_dir();
+		$path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
+		if ( $is_remove ) {
+			if ( file_exists($path) ) {
+				unlink($path);
+			}
+		} else {
+			$dirname = dirname($path);
+			if ( ! file_exists($dirname) ) {
+				wp_mkdir_p($dirname);
+			}
+
+			file_put_contents($path, $blob->content());
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a single blob content into matching post.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
+	 * @param boolean                $force
+	 *
+	 * @return Writing_On_GitHub_Post|false
+	 */
+	protected function blob_to_post( Writing_On_GitHub_Blob $blob, $force = false ) {
+		$args = array( 'post_content' => $blob->content_import() );
+		$meta = $blob->meta();
+
+		$id = false;
+
+		if ( ! empty( $meta ) ) {
+			if ( array_key_exists( 'layout', $meta ) ) {
+				$args['post_type'] = $meta['layout'];
+				unset( $meta['layout'] );
+			}
+
+			if ( array_key_exists( 'published', $meta ) ) {
+				$args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
+				unset( $meta['published'] );
+			}
+
+			if ( array_key_exists( 'post_title', $meta ) ) {
+				$args['post_title'] = $meta['post_title'];
+				unset( $meta['post_title'] );
+			}
+
+			if ( array_key_exists( 'post_name', $meta ) ) {
+				$args['post_name'] = $meta['post_name'];
+				unset( $meta['post_name'] );
+			}
+
+			if ( array_key_exists( 'ID', $meta ) ) {
+				$id = $args['ID'] = $meta['ID'];
+				$blob->set_id( $id );
+				unset( $meta['ID'] );
+			}
+
+			if ( array_key_exists( 'post_date', $meta ) ) {
+				if ( empty( $meta['post_date'] ) ) {
+					$meta['post_date'] = current_time( 'mysql' );
+				}
+
+				$args['post_date'] = $meta['post_date'];
+				unset( $meta['post_date'] );
+			}
+		}
+
+		$meta['_wogh_sha'] = $blob->sha();
+
+		if ( ! $force && $id ) {
+			$old_sha = get_post_meta( $id, '_wogh_sha', true );
+			$old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+
+			// dont save post when has same sha
+			if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
+				 $old_github_path && $old_github_path == $blob->path() ) {
+				return false;
+			}
+		}
+
+		$post = new Writing_On_GitHub_Post( $args, $this->app->api() );
+		$post->set_old_github_path( $blob->path() );
+		$post->set_meta( $meta );
+		$post->set_blob( $blob );
+		$blob->set_id( $post->id() );
+
+		return $post;
+	}
 }

lib/post.php

Indentation +476 added lines, -476 removed lines

@@ -9,480 +9,480 @@
  */
 class Writing_On_GitHub_Post {
 
-    /**
-     * Api object
-     *
-     * @var Writing_On_GitHub_Api
-     */
-    public $api;
-
-    /**
-     * Post ID
-     * @var integer
-     */
-    public $id = 0;
-
-    /**
-     * Blob object
-     * @var Writing_On_GitHub_Blob
-     */
-    public $blob;
-
-    /**
-     * Post object
-     * @var WP_Post
-     */
-    public $post;
-
-    /**
-     * Post args.
-     *
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * Post meta.
-     *
-     * @var array
-     */
-    protected $meta;
-
-    /**
-     * Whether the post has been saved.
-     *
-     * @var bool
-     */
-    protected $new = true;
-
-
-    protected $old_github_path;
-
-    /**
-     * Instantiates a new Post object
-     *
-     * @param int|array                 $id_or_args Either a post ID or an array of arguments.
-     * @param Writing_On_GitHub_Api $api API object.
-     *
-     * @todo remove database operations from this method
-     */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
-        $this->api = $api;
-
-        if ( is_numeric( $id_or_args ) ) {
-            $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
-            $this->new  = false;
-        }
-
-        if ( is_array( $id_or_args ) ) {
-            $this->args = $id_or_args;
-
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
-
-                if ( $this->post ) {
-                    $this->id  = $this->post->ID;
-                    $this->new = false;
-                } else {
-                    unset( $this->args['ID'] );
-                }
-            }
-        }
-    }
-
-    public function id() {
-        return $this->id;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function type() {
-        return $this->post->post_type;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function status() {
-        return $this->post->post_status;
-    }
-
-    /**
-     * Returns the post name
-     */
-    public function name() {
-        return $this->post->post_name;
-    }
-
-    /**
-     * Returns true if the post has a password
-     * @return bool
-     */
-    public function has_password() {
-        return ! empty( $this->post->post_password );
-    }
-
-    /**
-     * Combines the 2 content parts for GitHub
-     */
-    public function github_content() {
-        $use_blob = wogh_is_dont_export_content() && $this->blob;
-        $content = $use_blob ?
-            $this->blob->post_content() :
-            $this->post_content();
-
-        return $this->front_matter() . $content;
-        // $content = $this->front_matter() . $content;
-        // $ending  = apply_filters( 'wogh_line_endings', "\n" );
-
-        // return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
-    }
-
-    /**
-     * The post's YAML frontmatter
-     *
-     * Returns String the YAML frontmatter, ready to be written to the file
-     */
-    public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
-    }
-
-    /**
-     * Returns the post_content
-     *
-     * Markdownify's the content if applicable
-     */
-    public function post_content() {
-        $content = $this->post->post_content;
-
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
-                $content = $this->post->post_content_filtered;
-            }
-        }
-
-        return apply_filters( 'wogh_content_export', $content, $this );
-    }
-
-    public function old_github_path() {
-        return $this->old_github_path;
-    }
-
-    public function set_old_github_path( $path ) {
-        $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
-    }
-
-
-    /**
-     * Retrieves or calculates the proper GitHub path for a given post
-     *
-     * Returns (string) the path relative to repo root
-     */
-    public function github_path() {
-        $path = $this->github_directory() . $this->github_filename();
-
-        return $path;
-    }
-
-    /**
-     * Get GitHub directory based on post
-     *
-     * @return string
-     */
-    public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
-        }
-
-        $name = '';
-
-        switch ( $this->type() ) {
-            case 'post':
-                $name = 'posts';
-                break;
-            case 'page':
-                $name = 'pages';
-                break;
-            default:
-                $obj = get_post_type_object( $this->type() );
-
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
-                }
-
-                if ( ! $name ) {
-                    $name = '';
-                }
-        }
-
-        if ( $name ) {
-            $name = '_' . $name . '/';
-        }
-
-        return apply_filters( 'wogh_directory_published', $name, $this );
-    }
-
-    /**
-     * Build GitHub filename based on post
-     */
-    public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y/', $this->id ) . $this->get_name() . '.md';
-        } else {
-            $filename = $this->get_name() . '.md';
-        }
-
-        return apply_filters( 'wogh_filename', $filename, $this );
-    }
-
-    /**
-     * Returns a post slug we can use in the GitHub filename
-     *
-     * @return string
-     */
-    protected function get_name() {
-        if ( '' !== $this->name() ) {
-            return $this->name();
-        }
-
-        return sanitize_title( get_the_title( $this->post ) );
-    }
-
-    /**
-     * is put on github
-     * @return boolean
-     */
-    public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/blob/$branch/$github_path";
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/edit/$branch/$github_path";
-    }
-
-    /**
-     * Retrieve post type directory from blob path.
-     *
-     * @param string $path Path string.
-     *
-     * @return string
-     */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
-
-        return $directory;
-    }
-
-    /**
-     * Determines the last author to modify the post
-     *
-     * Returns Array an array containing the author name and email
-     */
-    public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
-
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
-            }
-        }
-
-        return array();
-    }
-
-    /**
-     * The post's sha
-     * Cached as post meta, or will make a live call if need be
-     *
-     * Returns String the sha1 hash
-     */
-    public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-
-        // If we've done a full export and we have no sha
-        // then we should try a live check to see if it exists.
-        // if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
-
-        //  // @todo could we eliminate this by calling down the full tree and searching it
-        //  $data = $this->api->fetch()->remote_contents( $this );
-
-        //  if ( ! is_wp_error( $data ) ) {
-        //      update_post_meta( $this->id, '_wogh_sha', $data->sha );
-        //      $sha = $data->sha;
-        //  }
-        // }
-
-        // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
-            $sha = '';
-        }
-
-        return $sha;
-    }
-
-    /**
-     * Save the sha to post
-     *
-     * @param string $sha
-     */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
-    }
-
-    /**
-     * The post's metadata
-     *
-     * Returns Array the post's metadata
-     */
-    public function meta() {
-        $meta = array(
-            'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
-            'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
-            'post_date'    => $this->post->post_date,
-            'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
-            'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
-        );
-        if ( empty($this->post->post_name) ) {
-            unset($meta['post_name']);
-        }
-        if ( empty($this->post->post_excerpt) ) {
-            unset($meta['post_excerpt']);
-        }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
-            unset($meta['author']);
-        }
-
-        //convert traditional post_meta values, hide hidden values, skip already populated values
-        // foreach ( get_post_custom( $this->id ) as $key => $value ) {
-
-        //  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
-        //      continue;
-        //  }
-
-        //  $meta[ $key ] = $value;
-
-        // }
-
-        return apply_filters( 'wogh_post_meta', $meta, $this );
-    }
-
-    /**
-     * Returns whether the Post has been saved in the DB yet.
-     *
-     * @return bool
-     */
-    public function is_new() {
-        return $this->new;
-    }
-
-    /**
-     * Sets the Post's meta.
-     *
-     * @param array $meta
-     */
-    public function set_meta( $meta ) {
-        $this->meta = $meta;
-    }
-
-    /**
-     * Returns the Post's arguments.
-     *
-     * @return array
-     */
-    public function get_args() {
-        return $this->args;
-    }
-
-    /**
-     * Returns the Post's meta.
-     *
-     * @return array
-     */
-    public function get_meta() {
-        return $this->meta;
-    }
-
-    /**
-     * Get the blob
-     * @return Writing_On_GitHub_Blob
-     */
-    public function get_blob() {
-        return $this->blob;
-    }
-
-    /**
-     * Set the blob
-     * @param Writing_On_GitHub_Blob $blob
-     */
-    public function set_blob( Writing_On_GitHub_Blob $blob ) {
-        $this->blob = $blob;
-    }
-
-    /**
-     * Sets the Post's WP_Post object.
-     *
-     * @param WP_Post $post
-     *
-     * @return $this
-     */
-    public function set_post( WP_Post $post ) {
-        $this->post = $post;
-        $this->id   = $post->ID;
-
-        return $this;
-    }
-
-    /**
-     * Transforms the Post into a Blob.
-     *
-     * @return Writing_On_GitHub_Blob
-     */
-    public function to_blob() {
-        $data = new stdClass;
-
-        $data->path    = $this->github_path();
-        $data->content = $this->github_content();
-        $data->sha     = $this->sha();
-
-        return new Writing_On_GitHub_Blob( $data );
-    }
+	/**
+	 * Api object
+	 *
+	 * @var Writing_On_GitHub_Api
+	 */
+	public $api;
+
+	/**
+	 * Post ID
+	 * @var integer
+	 */
+	public $id = 0;
+
+	/**
+	 * Blob object
+	 * @var Writing_On_GitHub_Blob
+	 */
+	public $blob;
+
+	/**
+	 * Post object
+	 * @var WP_Post
+	 */
+	public $post;
+
+	/**
+	 * Post args.
+	 *
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * Post meta.
+	 *
+	 * @var array
+	 */
+	protected $meta;
+
+	/**
+	 * Whether the post has been saved.
+	 *
+	 * @var bool
+	 */
+	protected $new = true;
+
+
+	protected $old_github_path;
+
+	/**
+	 * Instantiates a new Post object
+	 *
+	 * @param int|array                 $id_or_args Either a post ID or an array of arguments.
+	 * @param Writing_On_GitHub_Api $api API object.
+	 *
+	 * @todo remove database operations from this method
+	 */
+	public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+		$this->api = $api;
+
+		if ( is_numeric( $id_or_args ) ) {
+			$this->id   = (int) $id_or_args;
+			$this->post = get_post( $this->id );
+			$this->new  = false;
+		}
+
+		if ( is_array( $id_or_args ) ) {
+			$this->args = $id_or_args;
+
+			if ( isset( $this->args['ID'] ) ) {
+				$this->post = get_post( $this->args['ID'] );
+
+				if ( $this->post ) {
+					$this->id  = $this->post->ID;
+					$this->new = false;
+				} else {
+					unset( $this->args['ID'] );
+				}
+			}
+		}
+	}
+
+	public function id() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function type() {
+		return $this->post->post_type;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function status() {
+		return $this->post->post_status;
+	}
+
+	/**
+	 * Returns the post name
+	 */
+	public function name() {
+		return $this->post->post_name;
+	}
+
+	/**
+	 * Returns true if the post has a password
+	 * @return bool
+	 */
+	public function has_password() {
+		return ! empty( $this->post->post_password );
+	}
+
+	/**
+	 * Combines the 2 content parts for GitHub
+	 */
+	public function github_content() {
+		$use_blob = wogh_is_dont_export_content() && $this->blob;
+		$content = $use_blob ?
+			$this->blob->post_content() :
+			$this->post_content();
+
+		return $this->front_matter() . $content;
+		// $content = $this->front_matter() . $content;
+		// $ending  = apply_filters( 'wogh_line_endings', "\n" );
+
+		// return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+	}
+
+	/**
+	 * The post's YAML frontmatter
+	 *
+	 * Returns String the YAML frontmatter, ready to be written to the file
+	 */
+	public function front_matter() {
+		return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+	}
+
+	/**
+	 * Returns the post_content
+	 *
+	 * Markdownify's the content if applicable
+	 */
+	public function post_content() {
+		$content = $this->post->post_content;
+
+		if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
+			$content = wpmarkdown_html_to_markdown( $content );
+		} else if ( class_exists( 'WPCom_Markdown' ) ) {
+			if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+				$content = $this->post->post_content_filtered;
+			}
+		}
+
+		return apply_filters( 'wogh_content_export', $content, $this );
+	}
+
+	public function old_github_path() {
+		return $this->old_github_path;
+	}
+
+	public function set_old_github_path( $path ) {
+		$this->old_github_path = $path;
+		update_post_meta( $this->id, '_wogh_github_path', $path );
+	}
+
+
+	/**
+	 * Retrieves or calculates the proper GitHub path for a given post
+	 *
+	 * Returns (string) the path relative to repo root
+	 */
+	public function github_path() {
+		$path = $this->github_directory() . $this->github_filename();
+
+		return $path;
+	}
+
+	/**
+	 * Get GitHub directory based on post
+	 *
+	 * @return string
+	 */
+	public function github_directory() {
+		if ( 'publish' !== $this->status() ) {
+			return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+		}
+
+		$name = '';
+
+		switch ( $this->type() ) {
+			case 'post':
+				$name = 'posts';
+				break;
+			case 'page':
+				$name = 'pages';
+				break;
+			default:
+				$obj = get_post_type_object( $this->type() );
+
+				if ( $obj ) {
+					$name = strtolower( $obj->labels->name );
+				}
+
+				if ( ! $name ) {
+					$name = '';
+				}
+		}
+
+		if ( $name ) {
+			$name = '_' . $name . '/';
+		}
+
+		return apply_filters( 'wogh_directory_published', $name, $this );
+	}
+
+	/**
+	 * Build GitHub filename based on post
+	 */
+	public function github_filename() {
+		if ( 'post' === $this->type() ) {
+			$filename = get_the_time( 'Y/', $this->id ) . $this->get_name() . '.md';
+		} else {
+			$filename = $this->get_name() . '.md';
+		}
+
+		return apply_filters( 'wogh_filename', $filename, $this );
+	}
+
+	/**
+	 * Returns a post slug we can use in the GitHub filename
+	 *
+	 * @return string
+	 */
+	protected function get_name() {
+		if ( '' !== $this->name() ) {
+			return $this->name();
+		}
+
+		return sanitize_title( get_the_title( $this->post ) );
+	}
+
+	/**
+	 * is put on github
+	 * @return boolean
+	 */
+	public function is_on_github() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		if ( $sha && $github_path ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_view_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/blob/$branch/$github_path";
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_edit_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/edit/$branch/$github_path";
+	}
+
+	/**
+	 * Retrieve post type directory from blob path.
+	 *
+	 * @param string $path Path string.
+	 *
+	 * @return string
+	 */
+	public function get_directory_from_path( $path ) {
+		$directory = explode( '/', $path );
+		$directory = count( $directory ) > 0 ? $directory[0] : '';
+
+		return $directory;
+	}
+
+	/**
+	 * Determines the last author to modify the post
+	 *
+	 * Returns Array an array containing the author name and email
+	 */
+	public function last_modified_author() {
+		if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
+			$user = get_userdata( $last_id );
+
+			if ( $user ) {
+				return array( 'name' => $user->display_name, 'email' => $user->user_email );
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * The post's sha
+	 * Cached as post meta, or will make a live call if need be
+	 *
+	 * Returns String the sha1 hash
+	 */
+	public function sha() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+
+		// If we've done a full export and we have no sha
+		// then we should try a live check to see if it exists.
+		// if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
+
+		//  // @todo could we eliminate this by calling down the full tree and searching it
+		//  $data = $this->api->fetch()->remote_contents( $this );
+
+		//  if ( ! is_wp_error( $data ) ) {
+		//      update_post_meta( $this->id, '_wogh_sha', $data->sha );
+		//      $sha = $data->sha;
+		//  }
+		// }
+
+		// if the sha still doesn't exist, then it's empty
+		if ( ! $sha || is_wp_error( $sha ) ) {
+			$sha = '';
+		}
+
+		return $sha;
+	}
+
+	/**
+	 * Save the sha to post
+	 *
+	 * @param string $sha
+	 */
+	public function set_sha( $sha ) {
+		update_post_meta( $this->id, '_wogh_sha', $sha );
+	}
+
+	/**
+	 * The post's metadata
+	 *
+	 * Returns Array the post's metadata
+	 */
+	public function meta() {
+		$meta = array(
+			'ID'           => $this->id,
+			'post_title'   => get_the_title( $this->post ),
+			'post_name'    => $this->post->post_name,
+			'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+			'post_date'    => $this->post->post_date,
+			'post_excerpt' => $this->post->post_excerpt,
+			'layout'       => get_post_type( $this->post ),
+			'link'         => get_permalink( $this->post ),
+			'published'    => 'publish' === $this->status() ? true : false,
+			'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
+			'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+		);
+		if ( empty($this->post->post_name) ) {
+			unset($meta['post_name']);
+		}
+		if ( empty($this->post->post_excerpt) ) {
+			unset($meta['post_excerpt']);
+		}
+		if ( 'yes' == get_option('wogh_ignore_author') ) {
+			unset($meta['author']);
+		}
+
+		//convert traditional post_meta values, hide hidden values, skip already populated values
+		// foreach ( get_post_custom( $this->id ) as $key => $value ) {
+
+		//  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
+		//      continue;
+		//  }
+
+		//  $meta[ $key ] = $value;
+
+		// }
+
+		return apply_filters( 'wogh_post_meta', $meta, $this );
+	}
+
+	/**
+	 * Returns whether the Post has been saved in the DB yet.
+	 *
+	 * @return bool
+	 */
+	public function is_new() {
+		return $this->new;
+	}
+
+	/**
+	 * Sets the Post's meta.
+	 *
+	 * @param array $meta
+	 */
+	public function set_meta( $meta ) {
+		$this->meta = $meta;
+	}
+
+	/**
+	 * Returns the Post's arguments.
+	 *
+	 * @return array
+	 */
+	public function get_args() {
+		return $this->args;
+	}
+
+	/**
+	 * Returns the Post's meta.
+	 *
+	 * @return array
+	 */
+	public function get_meta() {
+		return $this->meta;
+	}
+
+	/**
+	 * Get the blob
+	 * @return Writing_On_GitHub_Blob
+	 */
+	public function get_blob() {
+		return $this->blob;
+	}
+
+	/**
+	 * Set the blob
+	 * @param Writing_On_GitHub_Blob $blob
+	 */
+	public function set_blob( Writing_On_GitHub_Blob $blob ) {
+		$this->blob = $blob;
+	}
+
+	/**
+	 * Sets the Post's WP_Post object.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return $this
+	 */
+	public function set_post( WP_Post $post ) {
+		$this->post = $post;
+		$this->id   = $post->ID;
+
+		return $this;
+	}
+
+	/**
+	 * Transforms the Post into a Blob.
+	 *
+	 * @return Writing_On_GitHub_Blob
+	 */
+	public function to_blob() {
+		$data = new stdClass;
+
+		$data->path    = $this->github_path();
+		$data->content = $this->github_content();
+		$data->sha     = $this->sha();
+
+		return new Writing_On_GitHub_Blob( $data );
+	}
 }

lib/function.php

Indentation +15 added lines, -15 removed lines

@@ -8,10 +8,10 @@ 
  * @return WP_Error
  */
 function wogh_append_error( $error, $error2 ) {
-    if ( is_wp_error( $error ) ) {
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
-    }
-    return $error2;
+	if ( is_wp_error( $error ) ) {
+		$error->add( $error2->get_error_code(), $error2->get_error_message() );
+	}
+	return $error2;
 }
 
 /**
@@ -21,15 +21,15 @@ 
  * @return bool
  */
 function wogh_equal_front_matter( $post, $blob ) {
-    $str1 = $post->front_matter();
-    $str2 = $blob->front_matter();
-    return trim($str1) === trim($str2);
+	$str1 = $post->front_matter();
+	$str2 = $blob->front_matter();
+	return trim($str1) === trim($str2);
 }
 
 function wogh_equal_path( $post, $blob ) {
-    $str1 = $post->github_path();
-    $str2 = $blob->path();
-    return trim($str1) === trim($str2);
+	$str1 = $post->github_path();
+	$str2 = $blob->path();
+	return trim($str1) === trim($str2);
 }
 
 /**
@@ -37,7 +37,7 @@ 
  * @return bool
  */
 function wogh_is_dont_export_content() {
-    return 'yes' === get_option( 'wogh_dont_export_content' );
+	return 'yes' === get_option( 'wogh_dont_export_content' );
 }
 
 /**
@@ -47,8 +47,8 @@ 
  * @return string
  */
 function wogh_git_sha( $content ) {
-    // $header = "blob $len\0"
-    // sha1($header . $content)
-    $len = strlen( $content );
-    return sha1( "blob $len\0$content" );
+	// $header = "blob $len\0"
+	// sha1($header . $content)
+	$len = strlen( $content );
+	return sha1( "blob $len\0$content" );
 }