minor bugfix sysinfo

outdoorbits · Dec 6, 2024 · da24152 · da24152
1 parent b8cb5e8
commit da24152
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/scripts/backup.py b/scripts/backup.py
@@ -1487,7 +1487,12 @@ def finish(self):
 	) == True # else could be None
 
 	# generate thumbnails in secondary backup while uploading?
-	shiftGenerateThumbnails	= SecondaryBackupFollows and (args['TargetName'] == args['SecSourceName']) and (lib_storage.extractCloudService(args['SecTargetName'])[0] in ['cloud', 'cloud_rsync'])
+	shiftGenerateThumbnails	= ( \
+								SecondaryBackupFollows and \
+								(args['TargetName'] == args['SecSourceName']) and \
+								(args['TargetName'] in ['internal', 'usb', 'nvme']) and \
+								(lib_storage.extractCloudService(args['SecTargetName'])[0] in ['cloud', 'cloud_rsync'])
+	)
 
 	# primary backup
 	if SecondaryBackupFollows:

diff --git a/scripts/sysinfo.php b/scripts/sysinfo.php
@@ -130,29 +130,30 @@
 					$DeviceIdentifier	= '';
 				}
 
-				echo ("<tr><th style='vertical-align:top;'>$Lum</th><td style='padding-left: 10px;'>");
+				if ($Lum) {
+					echo ("<tr><th style='vertical-align:top;'>$Lum</th><td style='padding-left: 10px;'>");
 
-					unset($States);
-					exec("sudo smartctl -a $Lum", $States);
+						unset($States);
+						exec("sudo smartctl -a $Lum", $States);
 
-					$StatusMessage	= '';
-					foreach($States as $Line) {
-						if (strpos($Line, ': ')) {
-							$output	= true;
+						$StatusMessage	= '';
+						foreach($States as $Line) {
+							if (strpos($Line, ': ')) {
+								$output	= true;
 
-							list($Value, $measured)	= explode(':', $Line, 2);
-								$Value		= str_pad(trim($Value) . ':', 35, ' ');
-								$measured	= trim($measured);
+								list($Value, $measured)	= explode(':', $Line, 2);
+									$Value		= str_pad(trim($Value) . ':', 35, ' ');
+									$measured	= trim($measured);
 
-							echo ($Value . $measured . '<br>');
+								echo ($Value . $measured . '<br>');
+							}
 						}
-					}
-
-					if (! $output) {
-						echo ('-');
-					}
 
-				echo ("</td></tr>");
+					echo ("</td></tr>");
+				}
+			}
+			if (! $output) {
+				echo ('<tr><td>-</td></tr>');
 			}
 			echo '</table></pre>';
 			?>