litefeel / writing-on-github

lib/fileinfo.php

Indentation +8 added lines, -8 removed lines

@@ -6,13 +6,13 @@
  */
 class Writing_On_GitHub_File_Info {
 
-    public function __construct( stdClass $data ) {
-        $this->sha          = $data->sha;
-        $this->path         = $data->path;
-        $this->status       = $data->status;
-    }
+	public function __construct( stdClass $data ) {
+		$this->sha          = $data->sha;
+		$this->path         = $data->path;
+		$this->status       = $data->status;
+	}
 
-    public $sha;
-    public $path;
-    public $status;  // added removed modified
+	public $sha;
+	public $path;
+	public $status;  // added removed modified
 }

lib/export.php

Indentation +255 added lines, -255 removed lines

@@ -10,259 +10,259 @@
  */
 class Writing_On_GitHub_Export {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Initializes a new export manager.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Updates all of the current posts in the database on master.
-     *
-     * @param  bool    $force
-     *
-     * @return string|WP_Error
-     */
-    public function full( $force = false ) {
-        $posts = $this->app->database()->fetch_all_supported( $force );
-
-        if ( is_wp_error( $posts ) ) {
-            /*　@var WP_Error $posts */
-            return $posts;
-        }
-
-        $error = '';
-
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        if ( is_wp_error( $error ) ) {
-            /* @var WP_Error $error */
-            return $error;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-
-    /**
-     * Check if it exists in github
-     * @param  int  $post_id
-     * @return boolean
-     */
-    protected function github_path( $post_id ) {
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
-
-        if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
-            return $github_path;
-        }
-
-        return false;
-    }
-
-    /**
-     * Updates the provided post ID in master.
-     *
-     * @param int $post_id Post ID to update.
-     *
-     * @return string|WP_Error
-     */
-    public function update( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
-
-        if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
-            return $post;
-        }
-
-        if ( 'trash' === $post->status() ) {
-            return $this->delete( $post_id );
-        }
-
-        if ( $old_github_path = $this->github_path( $post->id() ) ) {
-            error_log("old_github_path: $old_github_path");
-            $post->set_old_github_path($old_github_path);
-        }
-
-        $result = $this->new_posts( array( $post ) );
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-    /**
-     * Updates GitHub-created posts with latest WordPress data.
-     *
-     * @param Writing_On_GitHub_Post[] $posts Array of Posts to create.
-     *
-     * @return string|WP_Error
-     */
-    public function new_posts( array $posts ) {
-        $persist = $this->app->api()->persist();
-
-        $error = '';
-        foreach ( $posts as $post ) {
-            $result = $this->new_post( $post, $persist );
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        if ( is_wp_error( $error ) ) {
-            return $error;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-    protected function new_post( $post, $persist ) {
-        $github_path = $post->github_path();
-        $old_github_path = $post->old_github_path();
-        $blob = $post->to_blob();
-        $result = false;
-
-        if ( $old_github_path && $old_github_path != $github_path ) {
-            // rename
-            $message = apply_filters(
-                'wogh_commit_msg_move_post',
-                sprintf(
-                    'Move %s to %s via WordPress at %s (%s)',
-                    $old_github_path, $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-
-            $result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        } elseif ( ! $old_github_path ) {
-            // create new
-            $message = apply_filters(
-                'wogh_commit_msg_new_post',
-                sprintf(
-                    'Create new post %s from WordPress at %s (%s)',
-                    $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        } elseif ( $old_github_path && $old_github_path == $github_path ) {
-            // update
-            $message = apply_filters(
-                'wogh_commit_msg_update_post',
-                sprintf(
-                    'Update post %s from WordPress at %s (%s)',
-                    $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-            $result = $persist->update_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        }
-
-        $sha = $result->content->sha;
-        $post->set_sha($sha);
-        $post->set_old_github_path($github_path);
-
-        return true;
-    }
-
-    /**
-     * Deletes a provided post ID from master.
-     *
-     * @param int $post_id Post ID to delete.
-     *
-     * @return string|WP_Error
-     */
-    public function delete( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
-
-        if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
-            return $post;
-        }
-
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
-
-        $message = apply_filters(
-            'wogh_commit_msg_delete',
-            sprintf(
-                'Deleting %s via WordPress at %s (%s)',
-                $github_path,
-                site_url(),
-                get_bloginfo( 'name' )
-            ),
-            $post
-        ) . $this->get_commit_msg_tag();
-
-        $result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-
-    /**
-     * Saves the export user to the database.
-     *
-     * @param int $user_id User ID to export with.
-     *
-     * @return bool
-     */
-    public function set_user( $user_id ) {
-        return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
-    }
-
-    /**
-     * Gets the commit message tag.
-     *
-     * @return string
-     */
-    protected function get_commit_msg_tag() {
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
-
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
-        }
-
-        return ' - ' . $tag;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Initializes a new export manager.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Updates all of the current posts in the database on master.
+	 *
+	 * @param  bool    $force
+	 *
+	 * @return string|WP_Error
+	 */
+	public function full( $force = false ) {
+		$posts = $this->app->database()->fetch_all_supported( $force );
+
+		if ( is_wp_error( $posts ) ) {
+			/*　@var WP_Error $posts */
+			return $posts;
+		}
+
+		$error = '';
+
+		foreach ( $posts as $post ) {
+			$result = $this->update( $post->id() );
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		if ( is_wp_error( $error ) ) {
+			/* @var WP_Error $error */
+			return $error;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+
+	/**
+	 * Check if it exists in github
+	 * @param  int  $post_id
+	 * @return boolean
+	 */
+	protected function github_path( $post_id ) {
+		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+
+		if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
+			return $github_path;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates the provided post ID in master.
+	 *
+	 * @param int $post_id Post ID to update.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function update( $post_id ) {
+		$post = $this->app->database()->fetch_by_id( $post_id );
+
+		if ( is_wp_error( $post ) ) {
+			/*　@var WP_Error $post */
+			return $post;
+		}
+
+		if ( 'trash' === $post->status() ) {
+			return $this->delete( $post_id );
+		}
+
+		if ( $old_github_path = $this->github_path( $post->id() ) ) {
+			error_log("old_github_path: $old_github_path");
+			$post->set_old_github_path($old_github_path);
+		}
+
+		$result = $this->new_posts( array( $post ) );
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+	/**
+	 * Updates GitHub-created posts with latest WordPress data.
+	 *
+	 * @param Writing_On_GitHub_Post[] $posts Array of Posts to create.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function new_posts( array $posts ) {
+		$persist = $this->app->api()->persist();
+
+		$error = '';
+		foreach ( $posts as $post ) {
+			$result = $this->new_post( $post, $persist );
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		if ( is_wp_error( $error ) ) {
+			return $error;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+	protected function new_post( $post, $persist ) {
+		$github_path = $post->github_path();
+		$old_github_path = $post->old_github_path();
+		$blob = $post->to_blob();
+		$result = false;
+
+		if ( $old_github_path && $old_github_path != $github_path ) {
+			// rename
+			$message = apply_filters(
+				'wogh_commit_msg_move_post',
+				sprintf(
+					'Move %s to %s via WordPress at %s (%s)',
+					$old_github_path, $github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+
+			$result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+
+			$result = $persist->create_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		} elseif ( ! $old_github_path ) {
+			// create new
+			$message = apply_filters(
+				'wogh_commit_msg_new_post',
+				sprintf(
+					'Create new post %s from WordPress at %s (%s)',
+					$github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+			$result = $persist->create_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		} elseif ( $old_github_path && $old_github_path == $github_path ) {
+			// update
+			$message = apply_filters(
+				'wogh_commit_msg_update_post',
+				sprintf(
+					'Update post %s from WordPress at %s (%s)',
+					$github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+			$result = $persist->update_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		}
+
+		$sha = $result->content->sha;
+		$post->set_sha($sha);
+		$post->set_old_github_path($github_path);
+
+		return true;
+	}
+
+	/**
+	 * Deletes a provided post ID from master.
+	 *
+	 * @param int $post_id Post ID to delete.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function delete( $post_id ) {
+		$post = $this->app->database()->fetch_by_id( $post_id );
+
+		if ( is_wp_error( $post ) ) {
+			/*　@var WP_Error $post */
+			return $post;
+		}
+
+		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+
+		$message = apply_filters(
+			'wogh_commit_msg_delete',
+			sprintf(
+				'Deleting %s via WordPress at %s (%s)',
+				$github_path,
+				site_url(),
+				get_bloginfo( 'name' )
+			),
+			$post
+		) . $this->get_commit_msg_tag();
+
+		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+
+	/**
+	 * Saves the export user to the database.
+	 *
+	 * @param int $user_id User ID to export with.
+	 *
+	 * @return bool
+	 */
+	public function set_user( $user_id ) {
+		return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
+	}
+
+	/**
+	 * Gets the commit message tag.
+	 *
+	 * @return string
+	 */
+	protected function get_commit_msg_tag() {
+		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+
+		if ( ! $tag ) {
+			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		}
+
+		return ' - ' . $tag;
+	}
 }

lib/database.php

Indentation +527 added lines, -527 removed lines

@@ -9,531 +9,531 @@
  */
 class Writing_On_GitHub_Database {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Currently whitelisted post types.
-     *
-     * @var array
-     */
-    protected $whitelisted_post_types = array( 'post', 'page' );
-
-    /**
-     * Currently whitelisted post statuses.
-     *
-     * @var array
-     */
-    protected $whitelisted_post_statuses = array( 'publish' );
-
-    /**
-     * Instantiates a new Database object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Queries the database for all of the supported posts.
-     *
-     * @param  bool $force
-     *
-     * @return Writing_On_GitHub_Post[]|WP_Error
-     */
-    public function fetch_all_supported( $force = false ) {
-        $args  = array(
-            'post_type'   => $this->get_whitelisted_post_types(),
-            'post_status' => $this->get_whitelisted_post_statuses(),
-            'nopaging'    => true,
-            'fields'      => 'ids',
-        );
-
-        $query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
-
-        $post_ids = $query->get_posts();
-
-        if ( ! $post_ids ) {
-            return new WP_Error(
-                'no_results',
-                __( 'Querying for supported posts returned no results.', 'writing-on-github' )
-            );
-        }
-
-        /* @var Writing_On_GitHub_Post[] $results */
-        $results = array();
-        foreach ( $post_ids as $post_id ) {
-            // Do not export posts that have already been exported
-            if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-                 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
-
-                $results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Queries a post and returns it if it's supported.
-     *
-     * @param int $post_id Post ID to fetch.
-     *
-     * @return WP_Error|Writing_On_GitHub_Post
-     */
-    public function fetch_by_id( $post_id ) {
-        $post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
-
-        if ( ! $this->is_post_supported( $post ) ) {
-            return new WP_Error(
-                'unsupported_post',
-                sprintf(
-                    __(
-                        'Post ID %s is not supported by WOGH. See wiki to find out how to add support.',
-                        'writing-on-github'
-                    ),
-                    $post_id
-                )
-            );
-        }
-
-        return $post;
-    }
-
-    /**
-     * Saves an array of Post objects to the database
-     * and associates their author as well as their latest
-     *
-     * @param Writing_On_GitHub_Post[] $posts Array of Posts to save.
-     *
-     * @return string|WP_Error
-     */
-    public function save_posts( array $posts ) {
-
-        /**
-         * Whether an error has occurred.
-         *
-         * @var WP_Error|false $error
-         */
-        $error = false;
-
-        foreach ( $posts as $post ) {
-            $args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
-
-            remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
-            $post_id = $post->is_new() ?
-                wp_insert_post( $args, true ) :
-                wp_update_post( $args, true );
-            add_filter( 'content_save_pre', 'wp_filter_post_kses' );
-
-            if ( is_wp_error( $post_id ) ) {
-                /* @var WP_Error $post_id */
-                $error = wogh_append_error( $error, $post_id );
-
-                // Abort saving if updating the post fails.
-                continue;
-            }
-
-            if ( $post->is_new() ) {
-                $author = false;
-                $meta = $post->get_meta();
-                if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
-                    $author = $meta['author'];
-                }
-                $user    = $this->fetch_commit_user( $author );
-                $user_id = is_wp_error( $user ) ? 0 : $user->ID;
-                $this->set_post_author( $post_id, $user_id );
-            }
-
-            $post->set_post( get_post( $post_id ) );
-
-            $meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
-
-            update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
-
-            // unset( $meta['tags'] );
-            // unset( $meta['categories'] );
-            // unset( $meta['author'] );
-            // unset( $meta['post_date'] );
-            // unset( $meta['post_excerpt'] );
-            // unset( $meta['permalink'] );
-            // unset( $meta['link'] );
-
-            // foreach ( $meta as $key => $value ) {
-            //  update_post_meta( $post_id, $key, $value );
-            // }
-        }
-
-        if ( $error ) {
-            return $error;
-        }
-
-        return __( 'Successfully saved posts.', 'writing-on-github' );
-    }
-
-    protected function post_args( $post ) {
-        $args = $post->get_args();
-        $meta = $post->get_meta();
-
-        // prevent backslash loss
-        $args['post_content'] = addslashes( $args['post_content'] );
-
-        // update tags
-        if ( ! empty( $meta['tags'] ) ) {
-            $args['tags_input'] = $meta['tags'];
-        }
-
-        // update categories
-        if ( ! empty( $meta['categories'] ) ) {
-            $categories = $meta['categories'];
-            if ( ! is_array( $categories ) ) {
-                $categories = array( $categories );
-            }
-            $terms = get_terms( array(
-                'taxonomy' => 'category',
-                'fields' => 'id=>name',
-                'hide_empty' => 0,
-                'name' => $categories
-                )
-            );
-            $map = array();
-            foreach ( $categories as $name ) {
-                $map[$name] = 1;
-            }
-
-            $ids = array();
-            if ( ! empty( $terms ) ) {
-                foreach ( $terms as $id => $name ) {
-                    $ids[] = $id;
-                    unset( $map[$name] );
-                }
-            }
-
-            // create new terms
-            if ( ! empty( $map ) ) {
-                foreach ( $map as $name => $value ) {
-                    $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
-                    // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
-                    $ids[] = $term['term_id'];
-                }
-            }
-
-            $args['post_category'] = $ids;
-        }
-
-        return $args;
-    }
-
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
-        $title = $matches[4];
-
-        $query = new WP_Query( array(
-            'name'     => $title,
-            'posts_per_page' => 1,
-            'post_type' => $this->get_whitelisted_post_types(),
-            'fields'         => 'ids',
-        ) );
-
-        $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
-        return $post_id;
-    }
-
-    /**
-     * Deletes a post from the database based on its GitHub path.
-     *
-     * @param string $path Path of Post to delete.
-     *
-     * @return string|WP_Error
-     */
-    public function delete_post_by_path( $path ) {
-        $query = new WP_Query( array(
-            'meta_key'       => '_wogh_github_path',
-            'meta_value'     => $path,
-            'meta_compare'   => '=',
-            'posts_per_page' => 1,
-            'fields'         => 'ids',
-        ) );
-
-        $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
-
-        if ( ! $post_id ) {
-            $parts     = explode( '/', $path );
-            $filename  = array_pop( $parts );
-            $directory = $parts ? array_shift( $parts ) : '';
-
-            if ( false !== strpos( $directory, 'post' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
-            }
-
-            if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
-            }
-        }
-
-        if ( ! $post_id ) {
-            return new WP_Error(
-                'path_not_found',
-                sprintf(
-                    __( 'Post not found for path %s.', 'writing-on-github' ),
-                    $path
-                )
-            );
-        }
-
-        $result = wp_delete_post( $post_id );
-
-        // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
-
-            // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
-                // ... then something went wrong.
-                return new WP_Error(
-                    'db_error',
-                    sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
-                        $post_id
-                    )
-                );
-            }
-        }
-
-        return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    public function delete_post( $post_id ) {
-        $result = wp_delete_post( $post_id );
-
-        // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
-
-            // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
-                // ... then something went wrong.
-                return new WP_Error(
-                    'db_error',
-                    sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
-                        $post_id
-                    )
-                );
-            }
-        }
-
-        return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    /**
-     * Returns the list of post type permitted.
-     *
-     * @return array
-     */
-    protected function get_whitelisted_post_types() {
-        return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
-    }
-
-    /**
-     * Returns the list of post status permitted.
-     *
-     * @return array
-     */
-    protected function get_whitelisted_post_statuses() {
-        return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
-    }
-
-    /**
-     * Formats a whitelist array for a query.
-     *
-     * @param array $whitelist Whitelisted posts to format into query.
-     *
-     * @return string Whitelist formatted for query
-     */
-    protected function format_for_query( $whitelist ) {
-        foreach ( $whitelist as $key => $value ) {
-            $whitelist[ $key ] = "'$value'";
-        }
-
-        return implode( ', ', $whitelist );
-    }
-
-    /**
-     * Verifies that both the post's status & type
-     * are currently whitelisted
-     *
-     * @param  Writing_On_GitHub_Post $post Post to verify.
-     *
-     * @return boolean                          True if supported, false if not.
-     */
-    protected function is_post_supported( Writing_On_GitHub_Post $post ) {
-        if ( wp_is_post_revision( $post->id ) ) {
-            return false;
-        }
-
-        // We need to allow trashed posts to be queried, but they are not whitelisted for export.
-        if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
-            return false;
-        }
-
-        if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
-            return false;
-        }
-
-        if ( $post->has_password() ) {
-            return false;
-        }
-
-        return apply_filters( 'wogh_is_post_supported', true, $post );
-    }
-
-    /**
-     * Retrieves the commit user for a provided display name
-     *
-     * Searches for a user with provided display name or returns
-     * the default user saved in the database.
-     *
-     * @param string $display_name User display name to search for.
-     *
-     * @return WP_Error|WP_User
-     */
-    protected function fetch_commit_user( $display_name ) {
-        // If we can't find a user and a default hasn't been set,
-        // we're just going to set the revision author to 0.
-        $user = false;
-
-        if ( ! empty( $display_name ) ) {
-            $search_string = esc_attr( $display_name );
-            $query = new WP_User_Query( array(
-                'search'         => "{$search_string}",
-                'search_columns' => array(
-                    'display_name',
-                    'user_nicename',
-                    'user_login',
-                )
-            ) );
-            $users = $query->get_results();
-            $user = empty($users) ? false : $users[0];
-        }
-
-        if ( ! $user ) {
-            // Use the default user.
-            $user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
-        }
-
-        if ( ! $user ) {
-            return new WP_Error(
-                'user_not_found',
-                sprintf(
-                    __( 'Commit user not found for email %s', 'writing-on-github' ),
-                    $email
-                )
-            );
-        }
-
-        return $user;
-    }
-
-    // /**
-    //  * Sets the author latest revision
-    //  * of the provided post ID to the provided user.
-    //  *
-    //  * @param int $post_id Post ID to update revision author.
-    //  * @param int $user_id User ID for revision author.
-    //  *
-    //  * @return string|WP_Error
-    //  */
-    // protected function set_revision_author( $post_id, $user_id ) {
-    //  $revision = wp_get_post_revisions( $post_id );
-
-    //  if ( ! $revision ) {
-    //      $new_revision = wp_save_post_revision( $post_id );
-
-    //      if ( ! $new_revision || is_wp_error( $new_revision ) ) {
-    //          return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
-    //      }
-
-    //      // `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
-    //      // in order to be consistent, let's make sure we have the whole object before continuing.
-    //      $revision = get_post( $new_revision );
-
-    //      if ( ! $revision ) {
-    //          return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
-    //      }
-    //  } else {
-    //      $revision = array_shift( $revision );
-    //  }
-
-    //  return $this->set_post_author( $revision->ID, $user_id );
-    // }
-
-    /**
-     * Updates the user ID for the provided post ID.
-     *
-     * Bypassing triggering any hooks, including creating new revisions.
-     *
-     * @param int $post_id Post ID to update.
-     * @param int $user_id User ID to update to.
-     *
-     * @return string|WP_Error
-     */
-    protected function set_post_author( $post_id, $user_id ) {
-        global $wpdb;
-
-        $result = $wpdb->update(
-            $wpdb->posts,
-            array(
-                'post_author' => (int) $user_id,
-            ),
-            array(
-                'ID' => (int) $post_id,
-            ),
-            array( '%d' ),
-            array( '%d' )
-        );
-
-        if ( false === $result ) {
-            return new WP_Error( 'db_error', $wpdb->last_error );
-        }
-
-        if ( 0 === $result ) {
-            return sprintf(
-                __( 'No change for post ID %d.', 'writing-on-github' ),
-                $post_id
-            );
-        }
-
-        clean_post_cache( $post_id );
-
-        return sprintf(
-            __( 'Successfully updated post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    // *
-    //  * Update the provided post's blob sha.
-    //  *
-    //  * @param Writing_On_GitHub_Post $post Post to update.
-    //  * @param string                     $sha Sha to update to.
-    //  *
-    //  * @return bool|int
-
-    // public function set_post_sha( $post, $sha ) {
-    //  return update_post_meta( $post->id, '_wogh_sha', $sha );
-    // }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Currently whitelisted post types.
+	 *
+	 * @var array
+	 */
+	protected $whitelisted_post_types = array( 'post', 'page' );
+
+	/**
+	 * Currently whitelisted post statuses.
+	 *
+	 * @var array
+	 */
+	protected $whitelisted_post_statuses = array( 'publish' );
+
+	/**
+	 * Instantiates a new Database object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Queries the database for all of the supported posts.
+	 *
+	 * @param  bool $force
+	 *
+	 * @return Writing_On_GitHub_Post[]|WP_Error
+	 */
+	public function fetch_all_supported( $force = false ) {
+		$args  = array(
+			'post_type'   => $this->get_whitelisted_post_types(),
+			'post_status' => $this->get_whitelisted_post_statuses(),
+			'nopaging'    => true,
+			'fields'      => 'ids',
+		);
+
+		$query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
+
+		$post_ids = $query->get_posts();
+
+		if ( ! $post_ids ) {
+			return new WP_Error(
+				'no_results',
+				__( 'Querying for supported posts returned no results.', 'writing-on-github' )
+			);
+		}
+
+		/* @var Writing_On_GitHub_Post[] $results */
+		$results = array();
+		foreach ( $post_ids as $post_id ) {
+			// Do not export posts that have already been exported
+			if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
+				 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
+
+				$results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Queries a post and returns it if it's supported.
+	 *
+	 * @param int $post_id Post ID to fetch.
+	 *
+	 * @return WP_Error|Writing_On_GitHub_Post
+	 */
+	public function fetch_by_id( $post_id ) {
+		$post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+
+		if ( ! $this->is_post_supported( $post ) ) {
+			return new WP_Error(
+				'unsupported_post',
+				sprintf(
+					__(
+						'Post ID %s is not supported by WOGH. See wiki to find out how to add support.',
+						'writing-on-github'
+					),
+					$post_id
+				)
+			);
+		}
+
+		return $post;
+	}
+
+	/**
+	 * Saves an array of Post objects to the database
+	 * and associates their author as well as their latest
+	 *
+	 * @param Writing_On_GitHub_Post[] $posts Array of Posts to save.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function save_posts( array $posts ) {
+
+		/**
+		 * Whether an error has occurred.
+		 *
+		 * @var WP_Error|false $error
+		 */
+		$error = false;
+
+		foreach ( $posts as $post ) {
+			$args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+
+			remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+			$post_id = $post->is_new() ?
+				wp_insert_post( $args, true ) :
+				wp_update_post( $args, true );
+			add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+
+			if ( is_wp_error( $post_id ) ) {
+				/* @var WP_Error $post_id */
+				$error = wogh_append_error( $error, $post_id );
+
+				// Abort saving if updating the post fails.
+				continue;
+			}
+
+			if ( $post->is_new() ) {
+				$author = false;
+				$meta = $post->get_meta();
+				if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
+					$author = $meta['author'];
+				}
+				$user    = $this->fetch_commit_user( $author );
+				$user_id = is_wp_error( $user ) ? 0 : $user->ID;
+				$this->set_post_author( $post_id, $user_id );
+			}
+
+			$post->set_post( get_post( $post_id ) );
+
+			$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
+
+			update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
+
+			// unset( $meta['tags'] );
+			// unset( $meta['categories'] );
+			// unset( $meta['author'] );
+			// unset( $meta['post_date'] );
+			// unset( $meta['post_excerpt'] );
+			// unset( $meta['permalink'] );
+			// unset( $meta['link'] );
+
+			// foreach ( $meta as $key => $value ) {
+			//  update_post_meta( $post_id, $key, $value );
+			// }
+		}
+
+		if ( $error ) {
+			return $error;
+		}
+
+		return __( 'Successfully saved posts.', 'writing-on-github' );
+	}
+
+	protected function post_args( $post ) {
+		$args = $post->get_args();
+		$meta = $post->get_meta();
+
+		// prevent backslash loss
+		$args['post_content'] = addslashes( $args['post_content'] );
+
+		// update tags
+		if ( ! empty( $meta['tags'] ) ) {
+			$args['tags_input'] = $meta['tags'];
+		}
+
+		// update categories
+		if ( ! empty( $meta['categories'] ) ) {
+			$categories = $meta['categories'];
+			if ( ! is_array( $categories ) ) {
+				$categories = array( $categories );
+			}
+			$terms = get_terms( array(
+				'taxonomy' => 'category',
+				'fields' => 'id=>name',
+				'hide_empty' => 0,
+				'name' => $categories
+				)
+			);
+			$map = array();
+			foreach ( $categories as $name ) {
+				$map[$name] = 1;
+			}
+
+			$ids = array();
+			if ( ! empty( $terms ) ) {
+				foreach ( $terms as $id => $name ) {
+					$ids[] = $id;
+					unset( $map[$name] );
+				}
+			}
+
+			// create new terms
+			if ( ! empty( $map ) ) {
+				foreach ( $map as $name => $value ) {
+					$term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+					// array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+					$ids[] = $term['term_id'];
+				}
+			}
+
+			$args['post_category'] = $ids;
+		}
+
+		return $args;
+	}
+
+	private function get_post_id_by_filename( $filename, $pattern  ) {
+		preg_match( $pattern , $filename, $matches );
+		$title = $matches[4];
+
+		$query = new WP_Query( array(
+			'name'     => $title,
+			'posts_per_page' => 1,
+			'post_type' => $this->get_whitelisted_post_types(),
+			'fields'         => 'ids',
+		) );
+
+		$post_id = $query->get_posts();
+		$post_id = array_pop( $post_id );
+		return $post_id;
+	}
+
+	/**
+	 * Deletes a post from the database based on its GitHub path.
+	 *
+	 * @param string $path Path of Post to delete.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function delete_post_by_path( $path ) {
+		$query = new WP_Query( array(
+			'meta_key'       => '_wogh_github_path',
+			'meta_value'     => $path,
+			'meta_compare'   => '=',
+			'posts_per_page' => 1,
+			'fields'         => 'ids',
+		) );
+
+		$post_id = $query->get_posts();
+		$post_id = array_pop( $post_id );
+
+		if ( ! $post_id ) {
+			$parts     = explode( '/', $path );
+			$filename  = array_pop( $parts );
+			$directory = $parts ? array_shift( $parts ) : '';
+
+			if ( false !== strpos( $directory, 'post' ) ) {
+				$post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+			}
+
+			if ( ! $post_id ) {
+				$post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+			}
+		}
+
+		if ( ! $post_id ) {
+			return new WP_Error(
+				'path_not_found',
+				sprintf(
+					__( 'Post not found for path %s.', 'writing-on-github' ),
+					$path
+				)
+			);
+		}
+
+		$result = wp_delete_post( $post_id );
+
+		// If deleting fails...
+		if ( false === $result ) {
+			$post = get_post( $post_id );
+
+			// ...and the post both exists and isn't in the trash...
+			if ( $post && 'trash' !== $post->post_status ) {
+				// ... then something went wrong.
+				return new WP_Error(
+					'db_error',
+					sprintf(
+						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						$post_id
+					)
+				);
+			}
+		}
+
+		return sprintf(
+			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	public function delete_post( $post_id ) {
+		$result = wp_delete_post( $post_id );
+
+		// If deleting fails...
+		if ( false === $result ) {
+			$post = get_post( $post_id );
+
+			// ...and the post both exists and isn't in the trash...
+			if ( $post && 'trash' !== $post->post_status ) {
+				// ... then something went wrong.
+				return new WP_Error(
+					'db_error',
+					sprintf(
+						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						$post_id
+					)
+				);
+			}
+		}
+
+		return sprintf(
+			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	/**
+	 * Returns the list of post type permitted.
+	 *
+	 * @return array
+	 */
+	protected function get_whitelisted_post_types() {
+		return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
+	}
+
+	/**
+	 * Returns the list of post status permitted.
+	 *
+	 * @return array
+	 */
+	protected function get_whitelisted_post_statuses() {
+		return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
+	}
+
+	/**
+	 * Formats a whitelist array for a query.
+	 *
+	 * @param array $whitelist Whitelisted posts to format into query.
+	 *
+	 * @return string Whitelist formatted for query
+	 */
+	protected function format_for_query( $whitelist ) {
+		foreach ( $whitelist as $key => $value ) {
+			$whitelist[ $key ] = "'$value'";
+		}
+
+		return implode( ', ', $whitelist );
+	}
+
+	/**
+	 * Verifies that both the post's status & type
+	 * are currently whitelisted
+	 *
+	 * @param  Writing_On_GitHub_Post $post Post to verify.
+	 *
+	 * @return boolean                          True if supported, false if not.
+	 */
+	protected function is_post_supported( Writing_On_GitHub_Post $post ) {
+		if ( wp_is_post_revision( $post->id ) ) {
+			return false;
+		}
+
+		// We need to allow trashed posts to be queried, but they are not whitelisted for export.
+		if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
+			return false;
+		}
+
+		if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
+			return false;
+		}
+
+		if ( $post->has_password() ) {
+			return false;
+		}
+
+		return apply_filters( 'wogh_is_post_supported', true, $post );
+	}
+
+	/**
+	 * Retrieves the commit user for a provided display name
+	 *
+	 * Searches for a user with provided display name or returns
+	 * the default user saved in the database.
+	 *
+	 * @param string $display_name User display name to search for.
+	 *
+	 * @return WP_Error|WP_User
+	 */
+	protected function fetch_commit_user( $display_name ) {
+		// If we can't find a user and a default hasn't been set,
+		// we're just going to set the revision author to 0.
+		$user = false;
+
+		if ( ! empty( $display_name ) ) {
+			$search_string = esc_attr( $display_name );
+			$query = new WP_User_Query( array(
+				'search'         => "{$search_string}",
+				'search_columns' => array(
+					'display_name',
+					'user_nicename',
+					'user_login',
+				)
+			) );
+			$users = $query->get_results();
+			$user = empty($users) ? false : $users[0];
+		}
+
+		if ( ! $user ) {
+			// Use the default user.
+			$user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
+		}
+
+		if ( ! $user ) {
+			return new WP_Error(
+				'user_not_found',
+				sprintf(
+					__( 'Commit user not found for email %s', 'writing-on-github' ),
+					$email
+				)
+			);
+		}
+
+		return $user;
+	}
+
+	// /**
+	//  * Sets the author latest revision
+	//  * of the provided post ID to the provided user.
+	//  *
+	//  * @param int $post_id Post ID to update revision author.
+	//  * @param int $user_id User ID for revision author.
+	//  *
+	//  * @return string|WP_Error
+	//  */
+	// protected function set_revision_author( $post_id, $user_id ) {
+	//  $revision = wp_get_post_revisions( $post_id );
+
+	//  if ( ! $revision ) {
+	//      $new_revision = wp_save_post_revision( $post_id );
+
+	//      if ( ! $new_revision || is_wp_error( $new_revision ) ) {
+	//          return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
+	//      }
+
+	//      // `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
+	//      // in order to be consistent, let's make sure we have the whole object before continuing.
+	//      $revision = get_post( $new_revision );
+
+	//      if ( ! $revision ) {
+	//          return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
+	//      }
+	//  } else {
+	//      $revision = array_shift( $revision );
+	//  }
+
+	//  return $this->set_post_author( $revision->ID, $user_id );
+	// }
+
+	/**
+	 * Updates the user ID for the provided post ID.
+	 *
+	 * Bypassing triggering any hooks, including creating new revisions.
+	 *
+	 * @param int $post_id Post ID to update.
+	 * @param int $user_id User ID to update to.
+	 *
+	 * @return string|WP_Error
+	 */
+	protected function set_post_author( $post_id, $user_id ) {
+		global $wpdb;
+
+		$result = $wpdb->update(
+			$wpdb->posts,
+			array(
+				'post_author' => (int) $user_id,
+			),
+			array(
+				'ID' => (int) $post_id,
+			),
+			array( '%d' ),
+			array( '%d' )
+		);
+
+		if ( false === $result ) {
+			return new WP_Error( 'db_error', $wpdb->last_error );
+		}
+
+		if ( 0 === $result ) {
+			return sprintf(
+				__( 'No change for post ID %d.', 'writing-on-github' ),
+				$post_id
+			);
+		}
+
+		clean_post_cache( $post_id );
+
+		return sprintf(
+			__( 'Successfully updated post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	// *
+	//  * Update the provided post's blob sha.
+	//  *
+	//  * @param Writing_On_GitHub_Post $post Post to update.
+	//  * @param string                     $sha Sha to update to.
+	//  *
+	//  * @return bool|int
+
+	// public function set_post_sha( $post, $sha ) {
+	//  return update_post_meta( $post->id, '_wogh_sha', $sha );
+	// }
 }

lib/semaphore.php

Indentation +51 added lines, -51 removed lines

@@ -9,55 +9,55 @@
  */
 class Writing_On_GitHub_Semaphore {
 
-    /**
-     * Sempahore's option key.
-     */
-    const KEY = 'wogh_semaphore_lock';
-
-    /**
-     * Option key when semaphore is locked.
-     */
-    const VALUE_LOCKED = 'yes';
-
-    /**
-     * Option key when semaphore is unlocked.
-     */
-    const VALUE_UNLOCKED = 'no';
-
-    /**
-     * Clean up the old values on instantiation.
-     */
-    public function __construct() {
-        delete_option( self::KEY );
-    }
-
-    /**
-     * Checks if the Semaphore is open.
-     *
-     * Fails to report it's open if the the Api class can't make a call
-     * or the push lock has been enabled.
-     *
-     * @return bool
-     */
-    public function is_open() {
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Enables the push lock.
-     */
-    public function lock() {
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
-    }
-
-    /**
-     * Disables the push lock.
-     */
-    public function unlock() {
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
-    }
+	/**
+	 * Sempahore's option key.
+	 */
+	const KEY = 'wogh_semaphore_lock';
+
+	/**
+	 * Option key when semaphore is locked.
+	 */
+	const VALUE_LOCKED = 'yes';
+
+	/**
+	 * Option key when semaphore is unlocked.
+	 */
+	const VALUE_UNLOCKED = 'no';
+
+	/**
+	 * Clean up the old values on instantiation.
+	 */
+	public function __construct() {
+		delete_option( self::KEY );
+	}
+
+	/**
+	 * Checks if the Semaphore is open.
+	 *
+	 * Fails to report it's open if the the Api class can't make a call
+	 * or the push lock has been enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_open() {
+		if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Enables the push lock.
+	 */
+	public function lock() {
+		set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+	}
+
+	/**
+	 * Disables the push lock.
+	 */
+	public function unlock() {
+		set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+	}
 }

lib/request.php

Indentation +132 added lines, -132 removed lines

@@ -9,136 +9,136 @@
  */
 class Writing_On_GitHub_Request {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Raw request data.
-     *
-     * @var string
-     */
-    protected $raw_data;
-
-    /**
-     * Headers
-     * @var array
-     */
-    protected $headers;
-
-    /**
-     * Writing_On_GitHub_Request constructor.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Validates the header's secret.
-     *
-     * @return true|WP_Error
-     */
-    public function is_secret_valid() {
-        $headers = $this->headers();
-
-        $this->raw_data = $this->read_raw_data();
-
-        // Validate request secret.
-        $hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
-        if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
-            return false;
-        }
-
-        //      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
-        //     [Content-Type] => application/json
-        //     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
-        //     [X-Github-Event] => ping
-
-        return true;
-    }
-
-    /**
-     * Validates the ping event.
-     * @return boolean
-     */
-    public function is_ping() {
-        $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'ping' == $event;
-    }
-
-    /**
-     * Validates the push event.
-     * @return boolean
-     */
-    public function is_push() {
-        $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'push' == $event;
-    }
-
-    /**
-     * Returns a payload object for the given request.
-     *
-     * @return Writing_On_GitHub_Payload
-     */
-    public function payload() {
-        return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
-    }
-
-    /**
-     * Cross-server header support.
-     *
-     * Returns an array of the request's headers.
-     *
-     * @return array
-     */
-    protected function headers() {
-        if ( ! empty( $this->headers ) ) {
-            return $this->headers;
-        }
-
-        if ( function_exists( 'getallheaders' ) ) {
-
-            $this->headers = getallheaders();
-            return $this->headers;
-        }
-        /**
-         * Nginx and pre 5.4 workaround.
-         * @see http://www.php.net/manual/en/function.getallheaders.php
-         */
-        $this->headers = array();
-        foreach ( $_SERVER as $name => $value ) {
-            if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-                $this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
-            }
-        }
-
-        return $this->headers;
-    }
-
-    /**
-     * Reads the raw data from STDIN.
-     *
-     * @return string
-     */
-    protected function read_raw_data() {
-        return file_get_contents( 'php://input' );
-    }
-
-    /**
-     * Returns the Webhook secret
-     *
-     * @return string
-     */
-    protected function secret() {
-        return get_option( 'wogh_secret' );
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Raw request data.
+	 *
+	 * @var string
+	 */
+	protected $raw_data;
+
+	/**
+	 * Headers
+	 * @var array
+	 */
+	protected $headers;
+
+	/**
+	 * Writing_On_GitHub_Request constructor.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Validates the header's secret.
+	 *
+	 * @return true|WP_Error
+	 */
+	public function is_secret_valid() {
+		$headers = $this->headers();
+
+		$this->raw_data = $this->read_raw_data();
+
+		// Validate request secret.
+		$hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
+		if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
+			return false;
+		}
+
+		//      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
+		//     [Content-Type] => application/json
+		//     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
+		//     [X-Github-Event] => ping
+
+		return true;
+	}
+
+	/**
+	 * Validates the ping event.
+	 * @return boolean
+	 */
+	public function is_ping() {
+		$headers = $this->headers();
+
+		$event = $headers['X-Github-Event'];
+		return 'ping' == $event;
+	}
+
+	/**
+	 * Validates the push event.
+	 * @return boolean
+	 */
+	public function is_push() {
+		$headers = $this->headers();
+
+		$event = $headers['X-Github-Event'];
+		return 'push' == $event;
+	}
+
+	/**
+	 * Returns a payload object for the given request.
+	 *
+	 * @return Writing_On_GitHub_Payload
+	 */
+	public function payload() {
+		return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
+	}
+
+	/**
+	 * Cross-server header support.
+	 *
+	 * Returns an array of the request's headers.
+	 *
+	 * @return array
+	 */
+	protected function headers() {
+		if ( ! empty( $this->headers ) ) {
+			return $this->headers;
+		}
+
+		if ( function_exists( 'getallheaders' ) ) {
+
+			$this->headers = getallheaders();
+			return $this->headers;
+		}
+		/**
+		 * Nginx and pre 5.4 workaround.
+		 * @see http://www.php.net/manual/en/function.getallheaders.php
+		 */
+		$this->headers = array();
+		foreach ( $_SERVER as $name => $value ) {
+			if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
+				$this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			}
+		}
+
+		return $this->headers;
+	}
+
+	/**
+	 * Reads the raw data from STDIN.
+	 *
+	 * @return string
+	 */
+	protected function read_raw_data() {
+		return file_get_contents( 'php://input' );
+	}
+
+	/**
+	 * Returns the Webhook secret
+	 *
+	 * @return string
+	 */
+	protected function secret() {
+		return get_option( 'wogh_secret' );
+	}
 }

lib/blob.php

Indentation +207 added lines, -207 removed lines

@@ -9,211 +9,211 @@
  */
 class Writing_On_GitHub_Blob {
 
-    /**
-     * Complete blob content.
-     *
-     * @var string
-     */
-    protected $content;
-
-    /**
-     * Blob sha.
-     *
-     * @var string
-     */
-    protected $sha;
-
-    /**
-     * Blob path.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Post id.
-     *
-     * @var int
-     */
-    protected $id;
-
-    /**
-     * Whether the blob has frontmatter.
-     *
-     * @var boolean
-     */
-    protected $frontmatter = false;
-
-    /**
-     * Instantiates a new Blob object.
-     *
-     * @param stdClass $data Raw blob data.
-     */
-    public function __construct( stdClass $data ) {
-        $this->interpret_data( $data );
-    }
-
-    public function id() {
-        return $this->id;
-    }
-
-    public function set_id($id) {
-        $this->id = $id;
-    }
-
-    /**
-     * Returns the raw blob content.
-     *
-     * @return string
-     */
-    public function content() {
-        return $this->content;
-    }
-
-    /**
-     * Set's the blob's content.
-     *
-     * @param string $content Raw blob content.
-     * @param bool   $base64 Whether the content is base64 encoded.
-     *
-     * @return $this
-     */
-    public function set_content( $content, $base64 = false ) {
-        if ( $base64 ) {
-            $content = base64_decode( $content );
-        }
-
-        $this->frontmatter = '---' === substr( $this->content = $content, 0, 3 ) ? true : false;
-
-        return $this;
-    }
-    /**
-     * Returns the blob sha.
-     *
-     * @return string
-     */
-    public function sha() {
-        return $this->sha;
-    }
-
-    /**
-     * Return's the blob path.
-     *
-     * @return string
-     */
-    public function path() {
-        return $this->path;
-    }
-
-    /**
-     * Whether the blob has frontmatter.
-     *
-     * @return bool
-     */
-    public function has_frontmatter() {
-        return $this->frontmatter;
-    }
-
-    /**
-     * Returns the formatted/filtered blob content used for import.
-     *
-     * @return string
-     */
-    public function content_import() {
-        $content = $this->content();
-
-        if ( $this->has_frontmatter() ) {
-            // Break out content.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
-            $content = array_pop( $matches );
-        }
-
-        if ( function_exists( 'wpmarkdown_markdown_to_html' ) ) {
-            $content = wpmarkdown_markdown_to_html( $content );
-        }
-
-        /**
-         * Filters the content for import.
-         */
-        return apply_filters( 'wogh_content_import', trim( $content ) );
-    }
-
-    /**
-     * Returns the blob meta.
-     *
-     * @return array
-     */
-    public function meta() {
-        $meta = array();
-
-        if ( $this->has_frontmatter() ) {
-            // Break out meta, if present.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
-            array_pop( $matches );
-
-            $meta = spyc_load( $matches[2] );
-            if ( 'yes' == get_option('wogh_ignore_author') ) {
-                unset($meta['author']);
-            }
-            // if ( isset( $meta['link'] ) ) {
-            //  $meta['link'] = str_replace( home_url(), '', $meta['link'] );
-            // }
-        }
-
-        return $meta;
-    }
-
-    /**
-     * Formats the blob into an API call body.
-     *
-     * @return stdClass
-     */
-    // public function to_body() {
-    //  $data = new stdClass;
-
-    //  $data->mode = '100644';
-    //  $data->type = 'blob';
-
-    //  $data->path = $this->path();
-
-    //  if ( $this->sha() ) {
-    //      $data->sha = $this->sha();
-    //  } else {
-    //      $data->content = $this->content();
-    //  }
-
-    //  return $data;
-    // }
-
-
-    /**
-     * Formats the blob into an API call body.
-     *
-     * @return stdClass
-     */
-    public function to_body() {
-        $data = new stdClass;
-
-        // $data->mode = '100644';
-        // $data->type = 'blob';
-
-        $data->path = $this->path();
-        $data->content = base64_encode( $this->content() );
-        $data->sha = $this->sha;
-
-        return $data;
-    }
-
-    /**
-     * Interprets the blob's data into properties.
-     */
-    protected function interpret_data( $data ) {
-        $this->sha  = isset( $data->sha  ) ? $data->sha  : '';
-        $this->path = isset( $data->path ) ? $data->path : '';
-
-        $this->set_content(
-            isset( $data->content ) ? trim( $data->content ) : '',
-            isset( $data->encoding ) && 'base64' === $data->encoding ? true : false
-        );
-    }
+	/**
+	 * Complete blob content.
+	 *
+	 * @var string
+	 */
+	protected $content;
+
+	/**
+	 * Blob sha.
+	 *
+	 * @var string
+	 */
+	protected $sha;
+
+	/**
+	 * Blob path.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Post id.
+	 *
+	 * @var int
+	 */
+	protected $id;
+
+	/**
+	 * Whether the blob has frontmatter.
+	 *
+	 * @var boolean
+	 */
+	protected $frontmatter = false;
+
+	/**
+	 * Instantiates a new Blob object.
+	 *
+	 * @param stdClass $data Raw blob data.
+	 */
+	public function __construct( stdClass $data ) {
+		$this->interpret_data( $data );
+	}
+
+	public function id() {
+		return $this->id;
+	}
+
+	public function set_id($id) {
+		$this->id = $id;
+	}
+
+	/**
+	 * Returns the raw blob content.
+	 *
+	 * @return string
+	 */
+	public function content() {
+		return $this->content;
+	}
+
+	/**
+	 * Set's the blob's content.
+	 *
+	 * @param string $content Raw blob content.
+	 * @param bool   $base64 Whether the content is base64 encoded.
+	 *
+	 * @return $this
+	 */
+	public function set_content( $content, $base64 = false ) {
+		if ( $base64 ) {
+			$content = base64_decode( $content );
+		}
+
+		$this->frontmatter = '---' === substr( $this->content = $content, 0, 3 ) ? true : false;
+
+		return $this;
+	}
+	/**
+	 * Returns the blob sha.
+	 *
+	 * @return string
+	 */
+	public function sha() {
+		return $this->sha;
+	}
+
+	/**
+	 * Return's the blob path.
+	 *
+	 * @return string
+	 */
+	public function path() {
+		return $this->path;
+	}
+
+	/**
+	 * Whether the blob has frontmatter.
+	 *
+	 * @return bool
+	 */
+	public function has_frontmatter() {
+		return $this->frontmatter;
+	}
+
+	/**
+	 * Returns the formatted/filtered blob content used for import.
+	 *
+	 * @return string
+	 */
+	public function content_import() {
+		$content = $this->content();
+
+		if ( $this->has_frontmatter() ) {
+			// Break out content.
+			preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
+			$content = array_pop( $matches );
+		}
+
+		if ( function_exists( 'wpmarkdown_markdown_to_html' ) ) {
+			$content = wpmarkdown_markdown_to_html( $content );
+		}
+
+		/**
+		 * Filters the content for import.
+		 */
+		return apply_filters( 'wogh_content_import', trim( $content ) );
+	}
+
+	/**
+	 * Returns the blob meta.
+	 *
+	 * @return array
+	 */
+	public function meta() {
+		$meta = array();
+
+		if ( $this->has_frontmatter() ) {
+			// Break out meta, if present.
+			preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
+			array_pop( $matches );
+
+			$meta = spyc_load( $matches[2] );
+			if ( 'yes' == get_option('wogh_ignore_author') ) {
+				unset($meta['author']);
+			}
+			// if ( isset( $meta['link'] ) ) {
+			//  $meta['link'] = str_replace( home_url(), '', $meta['link'] );
+			// }
+		}
+
+		return $meta;
+	}
+
+	/**
+	 * Formats the blob into an API call body.
+	 *
+	 * @return stdClass
+	 */
+	// public function to_body() {
+	//  $data = new stdClass;
+
+	//  $data->mode = '100644';
+	//  $data->type = 'blob';
+
+	//  $data->path = $this->path();
+
+	//  if ( $this->sha() ) {
+	//      $data->sha = $this->sha();
+	//  } else {
+	//      $data->content = $this->content();
+	//  }
+
+	//  return $data;
+	// }
+
+
+	/**
+	 * Formats the blob into an API call body.
+	 *
+	 * @return stdClass
+	 */
+	public function to_body() {
+		$data = new stdClass;
+
+		// $data->mode = '100644';
+		// $data->type = 'blob';
+
+		$data->path = $this->path();
+		$data->content = base64_encode( $this->content() );
+		$data->sha = $this->sha;
+
+		return $data;
+	}
+
+	/**
+	 * Interprets the blob's data into properties.
+	 */
+	protected function interpret_data( $data ) {
+		$this->sha  = isset( $data->sha  ) ? $data->sha  : '';
+		$this->path = isset( $data->path ) ? $data->path : '';
+
+		$this->set_content(
+			isset( $data->content ) ? trim( $data->content ) : '',
+			isset( $data->encoding ) && 'base64' === $data->encoding ? true : false
+		);
+	}
 }