Dev-new-fixes-22 #108
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,4 +48,5 @@ sparsnessv="1" | |
| filetypesv="" | ||
| omoverthresh="" | ||
| cron="" | ||
| moverTuneCron="" | ||
| forceParity="no" | ||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,9 @@ | ||||||||||||||||||||||||||||||||||
| #!/usr/bin/php | ||||||||||||||||||||||||||||||||||
| <?PHP | ||||||||||||||||||||||||||||||||||
| $vars = @parse_ini_file("/var/local/emhttp/var.ini"); | ||||||||||||||||||||||||||||||||||
|
Check warning on line 3 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php
|
||||||||||||||||||||||||||||||||||
| if (version_compare($vars['version'], '7.2.1', '<')) { | ||||||||||||||||||||||||||||||||||
|
Check warning on line 4 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php
|
||||||||||||||||||||||||||||||||||
| exec("/usr/local/sbin/mover.old start >> /var/log/syslog &", $output, $retval); | ||||||||||||||||||||||||||||||||||
| } else { | ||||||||||||||||||||||||||||||||||
| exec("/usr/local/sbin/mover start >> /var/log/syslog &", $output, $retval); | ||||||||||||||||||||||||||||||||||
|
Check failure on line 7 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php
|
||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||
|
Comment on lines
+3
to
+8
There was a problem hiding this comment. Add null check for parse_ini_file failure. If $vars = @parse_ini_file("/var/local/emhttp/var.ini");
+if (!$vars || !isset($vars['version'])) {
+ exec("/usr/local/sbin/mover.old start >> /var/log/syslog &", $output, $retval);
+ exit;
+}
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);
}📝 Committable suggestion
Suggested change
🧰 Tools🪛 GitHub Check: Codacy Static Code Analysis[warning] 3-3: source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php#L3 [warning] 4-4: source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php#L4 [failure] 7-7: source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/moveNow.php#L7 🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||
| ?> | ||||||||||||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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', '>=')) { | ||
|
Check warning on line 60 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/mover.php
|
||
| if (isset($_POST['cmdStartTuneMover'])) { | ||
|
Check warning on line 61 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/mover.php
|
||
| $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 { | ||
| if (version_compare($vars['version'], '7.2.1', '<')) { | ||
|
Check warning on line 100 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/mover.php
|
||
| $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 $mover_str $options"); | ||
| passthru("ionice $ioLevel nice -n $niceLevel $mover_str $options"); | ||
|
Check failure on line 132 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/mover.php
|
||
| } | ||
| } | ||
|
|
||
| if ($cron && $cfg['moverDisabled'] == 'yes') { | ||
| logger("Mover Tuning schedule disabled"); | ||
| exit(); | ||
| } | ||
|
|
||
|
|
@@ -132,7 +143,7 @@ | |
| exit(); | ||
| } | ||
|
|
||
| logger("Starting Mover Tuning ..."); | ||
|
|
||
| startMover(); | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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") ?: []; | ||
|
Check warning on line 6 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
|
|
||
| // 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,36 @@ | |
| } | ||
| } | ||
|
|
||
| // Unraid Mover cron for unraid v7.2.1+ | ||
| function make_unraid_cron() | ||
| { | ||
| global $vars; | ||
|
|
||
| if (!empty($vars['shareMoverSchedule'])) { | ||
|
Check warning on line 31 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
| $moverCron = isset($vars['shareMoverSchedule']) ? trim($vars['shareMoverSchedule']) : ''; | ||
| $cronMoverFile = "# Generated mover schedule:\n" . $moverCron . " /usr/local/sbin/mover start |& logger -t move\n\n"; | ||
| file_put_contents("/boot/config/plugins/dynamix/mover.cron", $cronMoverFile); | ||
| } | ||
| } | ||
|
|
||
| // Mover Tuning cron for unraid v7.2.1+ | ||
| function make_tune_cron() | ||
| { | ||
| global $vars; | ||
|
|
||
| $tuneCron = isset($_POST['tune_cron']) ? trim($_POST['tune_cron']) : ''; | ||
|
Check failure on line 43 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
| $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.tuning.cron", $cronTuneFile); | ||
| } | ||
|
|
||
| // Cron for forced move (unraid mover) | ||
| function make_cron() | ||
| { | ||
| global $vars; | ||
| $version = $vars['version'] ?? '0.0.0'; | ||
| $mover = version_compare($version, '7.2.1', '<') ? '/usr/local/sbin/mover.old' : '/usr/local/sbin/mover'; | ||
|
Check warning on line 53 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
| $cron = isset($_POST['cron']) ? trim($_POST['cron']) : ''; | ||
|
Check failure on line 54 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
| $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); | ||
| } | ||
|
|
||
|
|
@@ -45,21 +75,54 @@ | |
|
|
||
| // Check if value was changed | ||
| if ($cfg_moverDisabled != $_POST["ismoverDisabled"]) { | ||
| global $vars; | ||
| // If mover schedule is disabled | ||
| if ($_POST['ismoverDisabled'] == "yes") { | ||
| // Check if the file exists | ||
| if (file_exists("/boot/config/plugins/dynamix/mover.cron")) { | ||
| @unlink("/boot/config/plugins/dynamix/mover.cron"); | ||
| logger("Mover schedule disabled successfully."); | ||
| } else { | ||
| logger("Error: Mover cron file does not exist"); | ||
| } | ||
| if (version_compare($vars['version'], '7.2.1', '>=')) { | ||
| // Check if the file exists | ||
| if (file_exists("/boot/config/plugins/ca.mover.tuning/mover.tuning.cron")) { | ||
| @unlink("/boot/config/plugins/ca.mover.tuning/mover.tuning.cron"); | ||
| logger("Mover Tuning schedule disabled successfully."); | ||
| } else { | ||
| logger("Error: Mover Tuning cron file does not exist"); | ||
| } | ||
| } | ||
| } else { | ||
| // If mover schedule is enabled | ||
| if (!file_exists("/boot/config/plugins/dynamix/mover.cron")) { | ||
| make_unraid_cron(); | ||
| logger("Mover schedule enabled successfully."); | ||
| } else { | ||
| logger("Error: Unable to create mover cron file — schedule not updated."); | ||
| } | ||
| if (version_compare($vars['version'], '7.2.1', '>=')) { | ||
| // Check if the file exists | ||
| if (!file_exists("/boot/config/plugins/ca.mover.tuning/mover.tuning.cron")) { | ||
| make_tune_cron(); | ||
| logger("Mover Tuning schedule enabled successfully."); | ||
| } else { | ||
| logger("Error: Unable to create Mover Tuning cron file — schedule not updated."); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Handle Mover Tuning custom cron schedule | ||
| if ($cfg_moverTuneCron != $_POST['tune_cron']) { | ||
|
Check warning on line 118 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
|
|
||
| if (trim($_POST['tune_cron']) != "") { | ||
|
Check failure on line 120 in source/ca.mover.tuning/usr/local/emhttp/plugins/ca.mover.tuning/updateCron.php
|
||
| make_tune_cron(); | ||
| logger("Mover Tuning cron schedule updated successfully."); | ||
| } else { | ||
| @unlink("/boot/config/plugins/ca.mover.tuning/mover.tuning.cron"); | ||
| logger("Mover Tuning cron schedule removed."); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.