Commits

Nathan Durnan  committed 2ce5874

Report Orphaned Backups even when not purging.
See Issue #4 at BitBucket.

  • Participants
  • Parent commits d347614
  • Branches BBI#4

Comments (0)

Files changed (2)

File .hgtimestamp

 .hgignore,1326153052.39
 .hgsub,1325791137.19
 .hgsubstate,1325791876.03
-_HgPreBackup.au3,1326760509.09
+_HgPreBackup.au3,1326761568.72
 HgPreBackup.ico,1325031982.39
 HgPreBackup.svg,1325032006.66
 HgPreBackup_x64.exe,1326752358.3

File _HgPreBackup.au3

 		If Not $bFoundMatch Then
 			;Backup not found in Source.
 			ConsoleWrite(@TAB & "Backup no longer in Source!" & @CRLF)
-			_LogFileAddMessage($Gh_LogFile, "Purging Orphaned Backup: " & $Ga_BackupRepoList[$ii])
 			$iResult = _ArrayAdd($Ga_PurgedBackupList, $Ga_BackupRepoList[$ii])
 			If ($iResult > 0) Then
 				$Ga_PurgedBackupList[0] = $iResult
 			EndIf ;Check results of adding item to array.
-			$iResult = FileRecycle($Ga_BackupRepoList[$ii])
-			If ($iResult > 0) Then
-				$jj = _ArrayDelete($Ga_BackupRepoList, $ii)
-				If ($jj >= 0) Then
-					$Ga_BackupRepoList[0] = ($jj - 1) ;don't count the first item - is is placeholder for count only!
-					$ii -= 1 ;Jump back one index to make up for removed item on next loop.
-				EndIf ;Check for successful array item deletion.
-			EndIf ;Check for successful repository deletion.
+			If Not $Gb_PurgeBackups Then
+				;Just report orphans found.
+				_LogFileAddMessage($Gh_LogFile, "Found Orphaned Backup: " & $Ga_BackupRepoList[$ii])
+			Else ;Purging Orphaned Backups.
+				_LogFileAddMessage($Gh_LogFile, "Purging Orphaned Backup: " & $Ga_BackupRepoList[$ii])
+				$iResult = FileRecycle($Ga_BackupRepoList[$ii])
+				If ($iResult > 0) Then
+					$jj = _ArrayDelete($Ga_BackupRepoList, $ii)
+					If ($jj >= 0) Then
+						$Ga_BackupRepoList[0] = ($jj - 1) ;don't count the first item - is is placeholder for count only!
+						$ii -= 1 ;Jump back one index to make up for removed item on next loop.
+					EndIf ;Check for successful array item deletion.
+				EndIf ;Check for successful repository deletion.
+			EndIf ;Check for PurgeBackups setting.
 		EndIf ;Check for backup not found in source.
 		$ii += 1 ;Increment Loop Variable.
 	Until ($ii > $Ga_BackupRepoList[0]) ;Loop through backup repositories.
 			EndIf ;Check for Validation Errors
 		EndIf ;check for any repositories found.
 		If ($Ga_PurgedBackupList[0] > 0) Then
-			$myResult = $myResult And FileWriteLine($IN_hLogFile, "|     Orphaned Backups Purged.: " & $Ga_PurgedBackupList[0])
-			$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       The following no longer have matching source repositories")
-			$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       and have been moved to the Recycle Bin: ")
+			$myResult = $myResult And FileWriteLine($IN_hLogFile, "|     Orphaned Backups Found..: " & $Ga_PurgedBackupList[0])
+			If Not $Gb_PurgeBackups Then
+				$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       The following no longer have matching source repositories")
+				$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       and should be evaluated as to their usefulness: ")
+			Else ;Orphans have been deleted.
+				$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       The following no longer have matching source repositories")
+				$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       and have been moved to the Recycle Bin: ")
+			EndIf ;Check for PurgeBackups setting.
 			For $ii = 1 to $Ga_PurgedBackupList[0]
 					$myResult = $myResult And FileWriteLine($IN_hLogFile, "|       > " & $Ga_PurgedBackupList[$ii])
 			Next ;Loop through list of repos