Support a usr script

Squidly271 · Mar 14, 2017 · badfc85 · badfc85
1 parent 255e892
commit badfc85
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/archive/ca.turbo-2017.03.12-x86_64-1.txz b/archive/ca.turbo-2017.03.12-x86_64-1.txz
diff --git a/archive/ca.turbo-2017.03.14-x86_64-1.txz b/archive/ca.turbo-2017.03.14-x86_64-1.txz
diff --git a/plugins/ca.turbo.plg b/plugins/ca.turbo.plg
@@ -2,8 +2,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "ca.turbo">
 <!ENTITY author    "Andrew Zawadzki">
-<!ENTITY version   "2017.03.12a">
-<!ENTITY md5       "9d038852fb57b98e33ed1fee8bc82bd9">
+<!ENTITY version   "2017.03.14">
+<!ENTITY md5       "3b8ce48ec914c925ca9b6898dd5dfd43">
 <!ENTITY launch    "Settings/Turbo">
 <!ENTITY plugdir   "/usr/local/emhttp/plugins/&name;">
 <!ENTITY github    "Squidly271/ca.turbo">
@@ -13,6 +13,9 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
 
 <CHANGES>
+###2017.03.14
+- Support a user script to force modes on a schedule (see support thread)
+
 ###2017.03.12a
 - Fix minor display aberration
 

diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png
diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php
@@ -46,19 +46,26 @@
     echo "Settings Updated";
     break;
   case 'status':
-    if ( is_file($turboPaths['backgroundPID']) ) {
-      $status = readJsonFile($turboPaths['status']);
-    }
-    if ( ! $status ) {
+    $status = readJsonFile($turboPaths['status']);
+    if ( (! is_file($turboPaths['backgroundPID']) ) && (! $status['override'] ) ) {
       $unRaidVars = parse_ini_file("/var/local/emhttp/var.ini");
       if ($unRaidVars['md_write_method'] == "1") {
         $status['mode'] = "turbo";
       }
     }
     $spunDown = ( $status ) ? $status['spundown'] : "<font color=red>Script Not Running</font>";
+
     $o = "<script>";
     $o .= "  $('#spunDown').html('$spunDown');";
     $msg = ($status['mode'] == "turbo") ? "Turbo (Reconstruct Write)" : "Normal (Read/Modify/Write)";
+
+    if ( $status['override'] ) {
+      $msg .= "  Autoscript overridden";
+    }
+    if ( (! is_file($turboPaths['backgroundPID']) ) && (! $status['override'] ) ) {
+      $msg = "unRaid Determined";
+    }
+
     $o .= "  $('#turboOn').html('$msg');";
     if ( is_file($turboPaths['backgroundPID']) ) {
       $o .= "  $('#running').html('<font color=green>Running</font>');";