Dev-new-fixes-22

source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/Mover.tuning.page

@@ -8,6 +8,7 @@ if ($var['shareCacheEnabled']!='yes') {
 } elseif ($var['shareUser']=='-') {
   echo "<p class='notice'>User shares not enabled!</p>";
 }
+$vars = @parse_ini_file("/var/local/emhttp/var.ini");
 $plugin = 'ca.mover.tuning';
 $config_file = '/boot/config/plugins/' . $plugin . '/' . $plugin . '.cfg';
 $config_default_file = '/usr/local/emhttp/plugins/' . $plugin . '/default.cfg';
@@ -30,6 +31,7 @@ $sizefDisabled = ($cfg['sizef'] != "yes") ? "disabled" : "";
 $sizefSyncDisabled = ($cfg['sizefSync'] != "yes") ? "disabled" : "";
 $sparsnessfDisabled = ($cfg['sparsnessf'] != "yes") ? "disabled" : "";
 $version = ($cfg['version']);
+$moverRunning = file_exists('/var/run/mover.pid');
 
 ?>
 
@@ -49,15 +51,20 @@ $.fn.toggleAttr = function(attr) {
 
 function updateCron() {
   var cron = $("#cronSchedule").val();
+  var tune_cron = $("#tune_cronSchedule").val();
 	var cronEnabled = $("#forceCron").val();
   var ismoverDisabled = $("#moverDisabled").val();
-	$.post("/plugins/ca.mover.tuning/updateCron.php",{cronEnabled:cronEnabled,cron:cron,ismoverDisabled:ismoverDisabled});
+	$.post("/plugins/ca.mover.tuning/updateCron.php",{cronEnabled:cronEnabled,cron:cron,tune_cron:tune_cron,ismoverDisabled:ismoverDisabled});
 }
 
 function moveNow() {
 	$.post("/plugins/ca.mover.tuning/mover.php crond start");
 }
 
+function startTuneMover() {
+$.post("/plugins/ca.mover.tuning/mover.php", { cmdStartTuneMover: 1 });
+}
+
 function resetDefaults() { 
   $.post("/plugins/ca.mover.tuning/reset.php");
 }
@@ -147,6 +154,16 @@ _(Disable Mover running on a schedule)_:
 :end
 
 <div markdown="1" id="moverTuningSettings">
+<?php if (version_compare($vars['version'], '7.2.1', '>=')): ?>
+_(Mover Tuning schedule)_:
+: <input type='text' id='tune_cronSchedule' name='moverTuneCron' size='1' class='tune_mycron' placeholder='0 */4 * * *' value='<?=htmlspecialchars($cfg['moverTuneCron'])?>'>
+
+<blockquote class="inline_help">
+<p>Runs the <strong><code>age_mover</code></strong> schedule from the Mover Tuning plugin using your custom cron entry (includes all plugin filters).</p>
+<p> Cron Schedule entry example <strong>0 */4 * * *</strong>.&nbsp; To run at <em>every</em><strong> 4 hours</strong>.&nbsp; <a href="https://crontab.guru/" target="_blank" rel="noopener noreferrer"><i class="fa fa-clock-o"></i> What Is Cron</a></p>
+</blockquote>
+<?php endif; ?>
+
 _(Test Mode (dry run))_:
 : <select name='testmode' size='1' id='testmode' onchange="toggleTestModeWarning(this.value)">
     <?=mk_option($cfg['testmode'],"no",_('No'))?>
@@ -704,6 +721,10 @@ _(Resynchronize all Primary files to Secondary)_:
     <input type="submit" name="#apply" value="_(Apply)_" id='Apply'>
     <input type="button" id="DONE" value="_(Done)_" onclick="done()">
     <input type="button" id="Defaults" value="_(Defaults)_" onclick="resetDefaults(); location.reload()">
+    <?if ($showMoverButton):?>
+      <input type="button" name="StartTuneMover" value="_(Move now)_" onclick="startTuneMover(); location.reload()" title="Run Mover Tuning ..."<?if ($moverRunning):?> disabled<?endif;?>>
+      <?if ($moverRunning):?><span>_(Mover is running)_</span><?endif;?>
+    <?endif;?>
   </span>
 
 </form>

source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/default.cfg

@@ -48,4 +48,5 @@ sparsnessv="1"
 filetypesv=""
 omoverthresh=""
 cron=""
+moverTuneCron=""
 forceParity="no"

source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php

@@ -1,4 +1,9 @@
 #!/usr/bin/php
 <?PHP
-exec("/usr/local/sbin/mover.old start >> /var/log/syslog &", $output, $retval);
+$vars = @parse_ini_file("/var/local/emhttp/var.ini");
+if (version_compare($vars['version'], '7.2.1', '<')) {
+    exec("/usr/local/sbin/mover.old start >> /var/log/syslog &", $output, $retval);
+} else {
+    exec("/usr/local/sbin/mover start >> /var/log/syslog &", $output, $retval);
+}
 ?>

source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/mover.php

@@ -56,6 +56,13 @@
                 logger("Option 1 set to 'start' due to version < 7.0.0\n");
             }
         }
+        // For Unraid v7.2.1+, use $_POST for pressed move now button in plugin page
+        else if (version_compare($vars['version'], '7.2.1', '>=')) {
+            if (isset($_POST['cmdStartTuneMover'])) {
+                $args[0] = 'start';
+                $option1 = $args[0];         
+            }
+        }
 
         // Combine all arguments into a single string with spaces
         $options = implode(' ', $args);
@@ -90,7 +97,11 @@
     if ($cfg['movenow'] == "yes") {
         $mover_str = "/usr/local/emhttp/plugins/ca.mover.tuning/age_mover";
     } else {
-        $mover_str = "/usr/local/sbin/mover.old";
+        if (version_compare($vars['version'], '7.2.1', '<')) {
+            $mover_str = "/usr/local/sbin/mover.old";
+        } else {
+            $mover_str = "/usr/local/sbin/mover";
+        }
     }
 
     if ($options == "stop") {
@@ -117,13 +128,13 @@
         //Default "move now" button has been hit.
         $niceLevel = $cfg['moverNice'] ?: "0";
         $ioLevel = $cfg['moverIO'] ?: "-c 2 -n 0";
-        logger("ionice $ioLevel nice -n $niceLevel /usr/local/sbin/mover.old $options");
-        passthru("ionice $ioLevel nice -n $niceLevel /usr/local/sbin/mover.old $options");
+        logger("ionice $ioLevel nice -n $niceLevel $mover_str $options");
+        passthru("ionice $ioLevel nice -n $niceLevel $mover_str $options");
     }
 }
 
 if ($cron && $cfg['moverDisabled'] == 'yes') {
-    logger("Mover schedule disabled");
+    logger("Mover Tuning schedule disabled");
     exit();
 }
 
@@ -132,7 +143,7 @@
     exit();
 }
 
-logger("Starting Mover ...");
+logger("Starting Mover Tuning ...");
 
 startMover();
 

source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php

@@ -3,13 +3,16 @@
 require_once("/usr/local/emhttp/plugins/dynamix/include/Wrappers.php");
 
 $cfg = parse_plugin_cfg("ca.mover.tuning");
+$vars = @parse_ini_file("/var/local/emhttp/var.ini") ?: [];
 
 // Get config value of forced cron
 $cfg_cronEnabled = $cfg['force'];
 // Get cron time of forced cron (normalized)
 $cfg_cron = trim($cfg['cron'] ?? '');
 // Get config value of mover disabled
 $cfg_moverDisabled = $cfg['moverDisabled'];
+// Get Mover Tuning cron time (normalized)
+$cfg_moverTuneCron = trim($cfg['moverTuneCron'] ?? $vars['shareMoverSchedule'] ?? '');
 
 function logger($string)
 {
@@ -20,9 +23,26 @@
 	}
 }
 
+function make_tune_cron()
+{
+	global $vars;
+	if (!empty($vars['shareMoverSchedule'])) {
+		// Disable Unraid mover
+		$vars['shareMoverSchedule'] = "";
+	}
+
+	$tuneCron = isset($_POST['tune_cron']) ? trim($_POST['tune_cron']) : '';
+	$cronTuneFile = "# Generated schedule for Mover Tuning move\n" . $tuneCron . " /usr/local/emhttp/plugins/ca.mover.tuning/age_mover start |& logger -t move\n\n";
+	file_put_contents("/boot/config/plugins/ca.mover.tuning/mover.tune.cron", $cronTuneFile);
+}
+
 function make_cron()
 {
-	$cronFile = "# Generated schedule for forced move\n" . trim($_POST['cron']) . " /usr/local/sbin/mover.old start |& logger -t move\n\n";
+	global $vars;
+	$version = $vars['version'] ?? '0.0.0';
+	$mover = version_compare($version, '7.2.1', '<') ? '/usr/local/sbin/mover.old' : '/usr/local/sbin/mover';
+	$cron = isset($_POST['cron']) ? trim($_POST['cron']) : '';
+	$cronFile = "# Generated schedule for forced move\n{$cron} {$mover} start |& logger -t move\n\n";
 	file_put_contents("/boot/config/plugins/ca.mover.tuning/mover.cron", $cronFile);
 }
 
@@ -63,5 +83,17 @@
 	}
 }
 
+// Handle Mover Tuning custom cron schedule
+if ($cfg_moverTuneCron != $_POST['tune_cron']) {
+
+	if (trim($_POST['tune_cron']) != "") {
+		make_tune_cron();
+		logger("Mover Tuning cron schedule updated successfully.");
+	} else {
+		@unlink("/boot/config/plugins/ca.mover.tuning/mover.tune.cron");
+		logger("Mover Tuning cron schedule removed.");
+	}
+}
+
 exec("update_cron");
 ?>