Added support for new awesome Grav 1.6 Scheduler

Author: w00fz

CHANGELOG.md

@@ -1,6 +1,8 @@
-# v2.0.0
-## mm/dd/2018
+# v2.0.0-rc.4
+## 10/04/2018
 
+1. [](#new)
+    * Added support for new awesome Grav 1.6 Scheduler
 1. [](#improved)
     * Fixed alignment of the git icon in the Wizard (#115)
     * Prevent Wizard modal to get canceled when clicking on the overlay background (#115)

blueprints.yaml

@@ -102,6 +102,29 @@ form:
       validate:
         type: bool
 
+    CronNotice:
+      type: spacer
+      markdown: true
+      text: |
+        ! You can also let Grav Scheduler automatically synchronize at a given time. You could for example disable all the automatic synchronizations above and just enable the Scheduler below. **Requires Grav 1.6**
+    sync.cron_enable:
+      type: toggle
+      label: Add Job to Scheduler
+      help: Add GitSync Job to the Scheduler so it can automatically perform synchronization at a given time
+      default: 0
+      highlight: 1
+      options:
+        1: PLUGIN_ADMIN.YES
+        0: PLUGIN_ADMIN.NO
+      validate:
+        type: bool
+
+    sync.cron_at:
+      type: cron
+      label: Run Scheduled Job
+      help: When should the scheduler run the automatic synchronization
+      default: '0 12,23 * * *'
+
     Repo:
       type: section
       title: Git Repository Settings

classes/Helper.php

@@ -78,6 +78,24 @@ public static function decrypt($enc_password)
         }
     }
 
+    public static function synchronize()
+    {
+        if (!Helper::isGitInstalled() || !Helper::isGitInitialized()) {
+            return true;
+        }
+
+        $git = new GitSync();
+
+        if ($git->hasChangesToCommit()) {
+            $git->commit();
+        }
+
+        // synchronize with remote
+        $git->sync();
+
+        return true;
+    }
+
     public static function preventReadablePassword($str, $password) {
       return str_replace(urlencode(self::decrypt($password)), '{password}', $str);
     }

git-sync.php

@@ -3,6 +3,7 @@
 namespace Grav\Plugin;
 
 use Grav\Common\Data\Data;
+use Grav\Common\Grav;
 use Grav\Common\Plugin;
 use Grav\Plugin\GitSync\AdminController;
 use Grav\Plugin\GitSync\GitSync;
@@ -25,9 +26,10 @@ class GitSyncPlugin extends Plugin
     public static function getSubscribedEvents()
     {
         return [
-            'onPluginsInitialized' => ['onPluginsInitialized', 1000],
-            'onPageInitialized'    => ['onPageInitialized', 0],
-            'onFormProcessed'      => ['onFormProcessed', 0]
+            'onPluginsInitialized'   => ['onPluginsInitialized', 1000],
+            'onPageInitialized'      => ['onPageInitialized', 0],
+            'onFormProcessed'        => ['onFormProcessed', 0],
+            'onSchedulerInitialized' => ['onSchedulerInitialized', 0]
         ];
     }
 
@@ -212,6 +214,22 @@ public function synchronize()
         return true;
     }
 
+    public function onSchedulerInitialized(Event $event)
+    {
+
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+        $run_at = $config->get('plugins.git-sync.sync.cron_at', '0 12,23 * * *');
+
+
+        if ($config->get('plugins.git-sync.sync.cron_enable', false)) {
+            /** @var Scheduler $scheduler */
+            $scheduler = $event['scheduler'];
+            $job = $scheduler->addFunction('Grav\Plugin\GitSync\Helper::synchronize', [], 'GitSync');
+            $job->at($run_at);
+        }
+    }
+
     public function reset()
     {
         if (!Helper::isGitInstalled() || !Helper::isGitInitialized()) {