litefeel / writing-on-github

lib/blob.php

Indentation +222 added lines, -222 removed lines

@@ -9,226 +9,226 @@
  */
 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;
-
-    /**
-     * The front matter of github post
-     * @var string
-     */
-    protected $front_matter = '';
-
-    /**
-     * 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 );
-
-        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;
-    }
-
-    /**
-     * The front matter of github post
-     * @return string
-     */
-    public function front_matter() {
-        return $this->front_matter;
-    }
-
-    /**
-     * 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 );
-            $this->front_matter = $matches[1];
-            $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;
+
+	/**
+	 * The front matter of github post
+	 * @var string
+	 */
+	protected $front_matter = '';
+
+	/**
+	 * 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 );
+
+		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;
+	}
+
+	/**
+	 * The front matter of github post
+	 * @return string
+	 */
+	public function front_matter() {
+		return $this->front_matter;
+	}
+
+	/**
+	 * 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 );
+			$this->front_matter = $matches[1];
+			$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
+		);
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -55,8 +55,8 @@ 
      *
      * @param stdClass $data Raw blob data.
      */
-    public function __construct( stdClass $data ) {
-        $this->interpret_data( $data );
+    public function __construct(stdClass $data) {
+        $this->interpret_data($data);
     }
 
     public function id() {
@@ -84,12 +84,12 @@ 
      *
      * @return $this
      */
-    public function set_content( $content, $base64 = false ) {
-        if ( $base64 ) {
-            $content = base64_decode( $content );
+    public function set_content($content, $base64 = false) {
+        if ($base64) {
+            $content = base64_decode($content);
         }
 
-        $this->frontmatter = '---' === substr( $this->content = $content, 0, 3 );
+        $this->frontmatter = '---' === substr($this->content = $content, 0, 3);
 
         return $this;
     }
@@ -136,21 +136,21 @@ 
     public function content_import() {
         $content = $this->content();
 
-        if ( $this->has_frontmatter() ) {
+        if ($this->has_frontmatter()) {
             // Break out content.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
+            preg_match('/(^---(.*?)---$)?(.*)/ms', $content, $matches);
             $this->front_matter = $matches[1];
-            $content = array_pop( $matches );
+            $content = array_pop($matches);
         }
 
-        if ( function_exists( 'wpmarkdown_markdown_to_html' ) ) {
-            $content = wpmarkdown_markdown_to_html( $content );
+        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 ) );
+        return apply_filters('wogh_content_import', trim($content));
     }
 
     /**
@@ -161,13 +161,13 @@ 
     public function meta() {
         $meta = array();
 
-        if ( $this->has_frontmatter() ) {
+        if ($this->has_frontmatter()) {
             // Break out meta, if present.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
-            array_pop( $matches );
+            preg_match('/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches);
+            array_pop($matches);
 
-            $meta = spyc_load( $matches[2] );
-            if ( 'yes' == get_option('wogh_ignore_author') ) {
+            $meta = spyc_load($matches[2]);
+            if ('yes' == get_option('wogh_ignore_author')) {
                 unset($meta['author']);
             }
             // if ( isset( $meta['link'] ) ) {
@@ -213,7 +213,7 @@ 
         // $data->type = 'blob';
 
         $data->path = $this->path();
-        $data->content = base64_encode( $this->content() );
+        $data->content = base64_encode($this->content());
         $data->sha = $this->sha;
 
         return $data;
@@ -222,13 +222,13 @@ 
     /**
      * 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 : '';
+    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
+            isset($data->content) ? trim($data->content) : '',
+            isset($data->encoding) && 'base64' === $data->encoding ? true : false
         );
     }
 }

lib/function.php

Indentation +7 added lines, -7 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,7 +21,7 @@ 
  * @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);
 }

Spacing +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
  * @param  WP_Error   $error2
  * @return WP_Error
  */
-function wogh_append_error( $error, $error2 ) {
-    if ( is_wp_error( $error ) ) {
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
+function wogh_append_error($error, $error2) {
+    if (is_wp_error($error)) {
+        $error->add($error2->get_error_code(), $error2->get_error_message());
     }
     return $error2;
 }
@@ -20,7 +20,7 @@ 
  * @param  Writing_On_GitHub_Blob $blob
  * @return bool
  */
-function wogh_equal_front_matter( $post, $blob ) {
+function wogh_equal_front_matter($post, $blob) {
     $str1 = $post->front_matter();
     $str2 = $blob->front_matter();
     return trim($str1) === trim($str2);

lib/import.php

Indentation +312 added lines, -312 removed lines

@@ -10,316 +10,316 @@
  */
 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
-     *
-     * @return true|WP_Error
-     */
-    protected function import_files( $files ) {
-
-        $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 );
-                }
-            }
-
-            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.
-     *
-     * @return string|WP_Error
-     */
-    public function master() {
-        $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 );
-        }
-
-        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
-     * @return WP_Error|bool
-     */
-    protected function import_post( Writing_On_GitHub_Blob $blob ) {
-        $post = $this->blob_to_post( $blob );
-
-        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_front_matter( $post, $blob ) ) {
-
-            $result = $this->app->export()->new_posts( array( $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.
-     *
-     * @return Writing_On_GitHub_Post|false
-     */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-        $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'] );
-            }
-        }
-
-        $meta['_wogh_sha'] = $blob->sha();
-
-        if ( $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 );
-        $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
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function import_files( $files ) {
+
+		$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 );
+				}
+			}
+
+			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.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function master() {
+		$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 );
+		}
+
+		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
+	 * @return WP_Error|bool
+	 */
+	protected function import_post( Writing_On_GitHub_Blob $blob ) {
+		$post = $this->blob_to_post( $blob );
+
+		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_front_matter( $post, $blob ) ) {
+
+			$result = $this->app->export()->new_posts( array( $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.
+	 *
+	 * @return Writing_On_GitHub_Post|false
+	 */
+	protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
+		$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'] );
+			}
+		}
+
+		$meta['_wogh_sha'] = $blob->sha();
+
+		if ( $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 );
+		$blob->set_id( $post->id() );
+
+		return $post;
+	}
 }

Spacing +74 added lines, -74 removed lines

@@ -22,7 +22,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -32,24 +32,24 @@ 
      *
      * @return string|WP_Error
      */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
+    public function payload(Writing_On_GitHub_Payload $payload) {
 
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+        $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             return $files;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -58,37 +58,37 @@ 
      *
      * @return true|WP_Error
      */
-    protected function import_files( $files ) {
+    protected function import_files($files) {
 
         $error = true;
 
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
+        foreach ($files as $file) {
+            if ( ! $this->importable_file($file)) {
                 continue;
             }
 
-            $blob = $this->app->api()->fetch()->blob( $file );
+            $blob = $this->app->api()->fetch()->blob($file);
             // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+            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 );
+            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 );
+                    $result = $this->import_post($blob);
                 }
             }
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
@@ -103,21 +103,21 @@ 
     public function master() {
         $result = $this->app->api()->fetch()->tree_recursive();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -127,14 +127,14 @@ 
      *
      * @return bool
      */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
         $path = $file->path;
 
         // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
+        $prefixs = array('_pages/', '_posts/', 'images/');
         foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+            if ( ! strncasecmp($path, $prefix, strlen($prefix))) {
                 return true;
             }
         }
@@ -148,7 +148,7 @@ 
      *
      * @return bool
      */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+    protected function importable_post(Writing_On_GitHub_Blob $blob) {
         // global $wpdb;
 
         // // Skip the repo's readme.
@@ -161,7 +161,7 @@ 
         //  return false;
         // }
 
-        if ( ! $blob->has_frontmatter() ) {
+        if ( ! $blob->has_frontmatter()) {
             return false;
         }
 
@@ -173,13 +173,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return WP_Error|bool
      */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+    protected function delete_post(Writing_On_GitHub_Blob $blob) {
         $id = $blob->id();
-        if ( empty( $id ) ) {
+        if (empty($id)) {
             return false;
         }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->delete_post($id);
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
@@ -191,31 +191,31 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return WP_Error|bool
      */
-    protected function import_post( Writing_On_GitHub_Blob $blob ) {
-        $post = $this->blob_to_post( $blob );
+    protected function import_post(Writing_On_GitHub_Blob $blob) {
+        $post = $this->blob_to_post($blob);
 
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
+        if ( ! $post instanceof Writing_On_GitHub_Post) {
             return false;
         }
 
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->save_post($post);
+        if (is_wp_error($result)) {
             /** @var WP_Error $result */
             return $result;
         }
 
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
+        if ($post->is_new() ||
+                ! wogh_equal_front_matter($post, $blob)) {
 
-            $result = $this->app->export()->new_posts( array( $post ) );
+            $result = $this->app->export()->new_posts(array($post));
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /** @var WP_Error $result */
                 return $result;
             }
         }
 
-        clean_post_cache( $post->id() );
+        clean_post_cache($post->id());
 
         return true;
     }
@@ -225,13 +225,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return bool
      */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
+    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) {
+        if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
             return false;
         }
 
@@ -243,16 +243,16 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @param  bool                   $is_remove
      */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $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) ) {
+        if ($is_remove) {
+            if (file_exists($path)) {
                 unlink($path);
             }
         } else {
             $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
+            if ( ! file_exists($dirname)) {
                 wp_mkdir_p($dirname);
             }
 
@@ -268,57 +268,57 @@ 
      *
      * @return Writing_On_GitHub_Post|false
      */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-        $args = array( 'post_content' => $blob->content_import() );
+    protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
+        $args = array('post_content' => $blob->content_import());
         $meta = $blob->meta();
 
         $id = false;
 
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
+        if ( ! empty($meta)) {
+            if (array_key_exists('layout', $meta)) {
                 $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
+                unset($meta['layout']);
             }
 
-            if ( array_key_exists( 'published', $meta ) ) {
+            if (array_key_exists('published', $meta)) {
                 $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
+                unset($meta['published']);
             }
 
-            if ( array_key_exists( 'post_title', $meta ) ) {
+            if (array_key_exists('post_title', $meta)) {
                 $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
+                unset($meta['post_title']);
             }
 
-            if ( array_key_exists( 'post_name', $meta ) ) {
+            if (array_key_exists('post_name', $meta)) {
                 $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
+                unset($meta['post_name']);
             }
 
-            if ( array_key_exists( 'ID', $meta ) ) {
+            if (array_key_exists('ID', $meta)) {
                 $id = $args['ID'] = $meta['ID'];
                 $blob->set_id($id);
-                unset( $meta['ID'] );
+                unset($meta['ID']);
             }
         }
 
         $meta['_wogh_sha'] = $blob->sha();
 
-        if ( $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+        if ($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() ) {
+            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 );
-        $blob->set_id( $post->id() );
+        $post = new Writing_On_GitHub_Post($args, $this->app->api());
+        $post->set_old_github_path($blob->path());
+        $post->set_meta($meta);
+        $blob->set_id($post->id());
 
         return $post;
     }

lib/admin.php

Indentation +208 added lines, -208 removed lines

@@ -9,235 +9,235 @@
  */
 class Writing_On_GitHub_Admin {
 
-    /**
-     * Hook into GitHub API
-     */
-    public function __construct() {
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
-    }
-
-    /**
-     * Callback to render the settings page view
-     */
-    public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
-    }
-
-    /**
-     * Callback to register the plugin's options
-     */
-    public function register_settings() {
-        add_settings_section(
-            'general',
-            'General Settings',
-            array( $this, 'section_callback' ),
-            Writing_On_GitHub::$text_domain
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'https://api.github.com',
-                'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'master',
-                'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
-        add_settings_field( 'wogh_dont_export_content', __( 'Don\'t export content', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_dont_export_content',
-                'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
-            )
-        );
-
-        // register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
-        // add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-        //      'default'   => '',
-        //      'name'      => 'wogh_ignore_metas',
-        //      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
-        //  )
-        // );
-    }
-
-    /**
-     * Callback to render an individual options field
-     *
-     * @param array $args Field arguments.
-     */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
-    }
-
-    /**
-     * Callback to render the default import user field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
-    }
-
-    /**
-     * Callback to render the textarea field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
-    }
-
-    /**
-     * Callback to render the checkbox field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
-    }
-
-    /**
-     * Displays settings messages from background processes
-     */
-    public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+	/**
+	 * Hook into GitHub API
+	 */
+	public function __construct() {
+		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+		add_action( 'admin_init', array( $this, 'register_settings' ) );
+		add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+	}
+
+	/**
+	 * Callback to render the settings page view
+	 */
+	public function settings_page() {
+		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+	}
+
+	/**
+	 * Callback to register the plugin's options
+	 */
+	public function register_settings() {
+		add_settings_section(
+			'general',
+			'General Settings',
+			array( $this, 'section_callback' ),
+			Writing_On_GitHub::$text_domain
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
+		add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'https://api.github.com',
+				'name'      => 'wogh_host',
+				'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
+		add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_repository',
+				'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
+		add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'master',
+				'name'      => 'wogh_branch',
+				'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
+		add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_oauth_token',
+				'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
+		add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_secret',
+				'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
+		add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_default_user',
+				'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
+		add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_ignore_author',
+				'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
+		add_settings_field( 'wogh_dont_export_content', __( 'Don\'t export content', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_dont_export_content',
+				'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
+			)
+		);
+
+		// register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
+		// add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		//      'default'   => '',
+		//      'name'      => 'wogh_ignore_metas',
+		//      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
+		//  )
+		// );
+	}
+
+	/**
+	 * Callback to render an individual options field
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	}
+
+	/**
+	 * Callback to render the default import user field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function user_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the textarea field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function textarea_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the checkbox field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function checkbox_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+	}
+
+	/**
+	 * Displays settings messages from background processes
+	 */
+	public function section_callback() {
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
-        }
+			delete_option( '_wogh_export_started' );
+		}
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_export_error' ) ) { ?>
             <div class="error">
                 <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
-        }
+			delete_option( '_wogh_export_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
-        }
+			delete_option( '_wogh_export_complete' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
-        }
+			delete_option( '_wogh_import_started' );
+		}
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_import_error' ) ) { ?>
             <div class="error">
             <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
-        }
+			delete_option( '_wogh_import_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
-        }
-    }
-
-    /**
-     * Add options menu to admin navbar
-     */
-    public function add_admin_menu() {
-        add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            'manage_options',
-            Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
-        );
-    }
-
-    /**
-     * Admin callback to trigger import/export because WordPress admin routing lol
-     */
-    public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( ! isset( $_GET['action'] ) ) {
-            return;
-        }
-
-        if ( 'export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export();
-        }
-
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
-
-        if ( 'import' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_import();
-        }
-
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
-        die;
-    }
+			delete_option( '_wogh_import_complete' );
+		}
+	}
+
+	/**
+	 * Add options menu to admin navbar
+	 */
+	public function add_admin_menu() {
+		add_options_page(
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			'manage_options',
+			Writing_On_GitHub::$text_domain,
+			array( $this, 'settings_page' )
+		);
+	}
+
+	/**
+	 * Admin callback to trigger import/export because WordPress admin routing lol
+	 */
+	public function trigger_cron() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( ! isset( $_GET['action'] ) ) {
+			return;
+		}
+
+		if ( 'export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export();
+		}
+
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
+
+		if ( 'import' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_import();
+		}
+
+		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		die;
+	}
 }

Spacing +66 added lines, -66 removed lines

@@ -13,16 +13,16 @@ 
      * Hook into GitHub API
      */
     public function __construct() {
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+        add_action('admin_menu', array($this, 'add_admin_menu'));
+        add_action('admin_init', array($this, 'register_settings'));
+        add_action('current_screen', array($this, 'trigger_cron'));
     }
 
     /**
      * Callback to render the settings page view
      */
     public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+        include dirname(dirname(__FILE__)) . '/views/options.php';
     }
 
     /**
@@ -32,71 +32,71 @@ 
         add_settings_section(
             'general',
             'General Settings',
-            array( $this, 'section_callback' ),
+            array($this, 'section_callback'),
             Writing_On_GitHub::$text_domain
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
+        add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'https://api.github.com',
                 'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+                'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
+        add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+                'help_text' => __('The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
+        add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'master',
                 'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+                'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
+        add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+                'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
+        add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+                'help_text' => __("The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
+        add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+                'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
-        add_settings_field( 'wogh_dont_export_content', __( 'Don\'t export content', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_dont_export_content');
+        add_settings_field('wogh_dont_export_content', __('Don\'t export content', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_dont_export_content',
-                'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
+                'help_text' => __('Do not export post content to github, only export meta.', 'writing-on-github'),
             )
         );
 
@@ -114,8 +114,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+    public function field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/setting-field.php';
     }
 
     /**
@@ -123,8 +123,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+    public function user_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
     }
 
     /**
@@ -132,8 +132,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+    public function textarea_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
     }
 
     /**
@@ -141,58 +141,58 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+    public function checkbox_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/checkbox-setting-field.php';
     }
 
     /**
      * Displays settings messages from background processes
      */
     public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_started')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
+                <p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
+            delete_option('_wogh_export_started');
         }
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+        if ($message = get_option('_wogh_export_error')) { ?>
             <div class="error">
-                <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+                <p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
+            delete_option('_wogh_export_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_complete')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
+                <p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
+            delete_option('_wogh_export_complete');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_started')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
+            <p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
+            delete_option('_wogh_import_started');
         }
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+        if ($message = get_option('_wogh_import_error')) { ?>
             <div class="error">
-            <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+            <p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
+            delete_option('_wogh_import_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_complete')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
+            <p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
+            delete_option('_wogh_import_complete');
         }
     }
 
@@ -201,11 +201,11 @@ 
      */
     public function add_admin_menu() {
         add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
+            __('Writing On GitHub', 'writing-on-github'),
+            __('Writing On GitHub', 'writing-on-github'),
             'manage_options',
             Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
+            array($this, 'settings_page')
         );
     }
 
@@ -213,31 +213,31 @@ 
      * Admin callback to trigger import/export because WordPress admin routing lol
      */
     public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
+        if ( ! current_user_can('manage_options')) {
             return;
         }
 
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( ! isset( $_GET['action'] ) ) {
+        if ( ! isset($_GET['action'])) {
             return;
         }
 
-        if ( 'export' === $_GET['action'] ) {
+        if ('export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export();
         }
 
-        if ( 'force_export' === $_GET['action'] ) {
+        if ('force_export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export(true);
         }
 
-        if ( 'import' === $_GET['action'] ) {
+        if ('import' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_import();
         }
 
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+        wp_redirect(admin_url('options-general.php?page=writing-on-github'));
         die;
     }
 }