- Allow multiple backups for a day (disabled by default)

- Rearranged some config variables
- Added some comments to the source code

diff --git a/TODO.md b/TODO.md
index 28bbea68152d811a0c07773b652610ef64238d8e..42ac55d110da44482f1cf65d319987b10536003e 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -8,4 +8,4 @@
 - [x] Rotate log files
 - [x] Suppress output of some commands
 - [ ] Add some comments to the source code
-- [ ] Allow multiple backups for a day
\ No newline at end of file
+- [x] Allow multiple backups for a day
\ No newline at end of file

diff --git a/dsmonrot.ps1 b/dsmonrot.ps1
index 43f3fdaf0cf3a0e70c89141b29de18f1c54909bd..ddaae59273511a17037a615a0008783acdeb254c 100644 (file)
--- a/dsmonrot.ps1
+++ b/dsmonrot.ps1
@@ -12,7 +12,12 @@
 # Config\r
 \r
 # Path to backup directory\r
+# This directory MUST exist, it is not created automatically!\r
 [String]$backupDir = "Z:\"\r
+# Disks to backup, see http://www.drivesnapshot.de/en/commandline.htm\r
+[String]$disksToBackup = "D1:1"\r
+# Path to Drive Snapshot\r
+[String]$dsPath = "C:\Users\Patrick\Desktop\DSMonRot\snapshot.exe"\r
 # Keep backups for this amount of months (excluding the current month),\r
 # -1 for indefinite\r
 [Int32]$keepMonths = 2\r
@@ -21,8 +26,8 @@
 # WARNING: If this option is set to $True and the full backup fails you could\r
 # have NO backup\r
 [Boolean]$rotateBeforeBackup = $False\r
-# Path to Drive Snapshot\r
-[String]$dsPath = "C:\Users\Patrick\Desktop\DSMonRot\snapshot.exe"\r
+# Set to $True if you want to allow multiple backups for a day\r
+[Boolean]$multipleDailyBackups = $False\r
 # Path to Drive Snapshot log file (specify only the file name if you set\r
 # $dsLogFileToBackup to $True)\r
 #[String]$dsLogFile = "C:\Users\Patrick\Desktop\DSMonRot\snapshot.log"\r
@@ -30,13 +35,11 @@
 # Set to $True if you want to put the log file of Drive Snapshot into the same\r
 # directory as the backup\r
 [Boolean]$dsLogFileToBackup = $True\r
-# Disks to backup, see http://www.drivesnapshot.de/en/commandline.htm\r
-[String]$disksToBackup = "HD1:1"\r
 # Path to directory where DSMonRot stores the log files\r
 # Every month a new log file is created\r
-[String]$logDir = "C:\Users\Patrick\Desktop\DSMonRot\log"\r
+[String]$logDir = "$PSScriptRoot\log"\r
 # Keep log files for this amount of months (excluding the current month),\r
-# 0 or less for indefinite (currently not available)\r
+# 0 or less for indefinite\r
 # You should set this to at least the same as $keepMonths\r
 [Int32]$keepLogs = 2\r
 \r
@@ -72,7 +75,6 @@
 \r
 # End of config\r
 \r
-# This function is originally by wasserja at https://gallery.technet.microsoft.com/scriptcenter/Write-Log-PowerShell-999c32d0\r
 <# \r
 .Synopsis \r
    Write-Log writes a message to a specified log file with the current time stamp. \r
@@ -189,10 +191,11 @@ function Write-Log
     } \r
 }\r
 \r
-# Allow SMTP with SSL and SMTP Auth\r
-# see: http://petermorrissey.blogspot.de/2013/01/sending-smtp-emails-with-powershell.html\r
 function Send-Email([String]$body) {\r
        try {\r
+               # Allow SMTP with SSL and SMTP Auth\r
+               # see: http://petermorrissey.blogspot.de/2013/01/sending-smtp-emails-with-powershell.html\r
+       \r
                $smtp = New-Object System.Net.Mail.SmtpClient($emailMailServer, $emailPort)\r
 \r
                $smtp.EnableSSL = $emailSSL\r
@@ -259,7 +262,9 @@ $dsCommand = ""
 \r
 $currMonth = Get-Date -format "yyyy-MM"\r
 $currDay = Get-Date -format "yyyy-MM-dd"\r
+$currTime = Get-Date -format "HH-mm-ss" # no colon because we need this for a directory name\r
 \r
+# Check if the directory for the log files exists and create it if necessary\r
 if(!(Test-Path $logDir)) {\r
        try {\r
                New-Item -ItemType directory -Path $logDir -ErrorAction Stop | Out-Null\r
@@ -272,10 +277,12 @@ if(!(Test-Path $logDir)) {
 \r
 $logFile = "$logDir\$currMonth.log"\r
 \r
+# Continue only if the log directory exists or if it was created successfully (no error message added)\r
 if($errorMessages.Count -eq 0) {\r
        $startTime = Get-Date -format "yyyy-MM-dd HH:mm:ss"\r
        Write-Log "Started at $startTime" -Path $logFile\r
 \r
+       # Connect the network drive if necessary\r
        if($smbDrive) {\r
                Write-Log "Connecting network drive $smbDrive to $smbPath" -Path $logFile\r
 \r
@@ -302,18 +309,29 @@ if($errorMessages.Count -eq 0) {
                }\r
        }\r
 \r
+       # Check if the backup directory exists\r
        if(!(Test-Path $backupDir)) {\r
                Write-Log "Directory $backupDir does not exist!" -Path $logFile -Level Error\r
                $errorMessages += "Directory $backupDir does not exist!"\r
        }\r
 \r
+       # Continue only if no error message was recorded (i.e. backup directory does not exist)\r
        if($errorMessages.Count -eq 0) {\r
+               # Compose the backup target directories\r
                $backupTarget = $backupDir + "\" + $currMonth\r
-               $backupTargetFull = $backupTarget + "\" + "Full"\r
+               $backupTargetFull = $backupTarget + "\Full"\r
 \r
-               $backupTargetDiff = $backupTarget + "\" + "Diff-" + $currDay\r
+               $backupTargetDiff = $backupTarget + "\Diff-" + $currDay\r
+               \r
+               if($multipleDailyBackups) {\r
+                       $backupTargetDiff = $backupTargetDiff + "-" + $currTime\r
+               }\r
 \r
+               # Check if the backup target for this month, the directory for the full backup\r
+               # and the hash files exists. In this case we do a differential backup.\r
                if((Test-Path $backupTarget) -and (Test-Path $backupTargetFull) -and (Test-Path "$backupTargetFull\*.hsh")) {\r
+                       # Do a differential backup\r
+               \r
                        Write-Log "Doing a differential backup" -Path $logFile\r
                        \r
                        $isDiff = $True\r
@@ -353,6 +371,8 @@ if($errorMessages.Count -eq 0) {
                        }\r
                }\r
                else {\r
+                       # Do a full backup\r
+               \r
                        Write-Log "Doing a full backup" -Path $logFile\r
 \r
                        if(!(Test-Path $backupTarget)) {\r
@@ -407,6 +427,7 @@ if($errorMessages.Count -eq 0) {
                }\r
        }\r
 \r
+       # Disconnect the network drive if necessary\r
        if($smbConnected) {\r
                Write-Log "Disconnecting network drive" -Path $logFile\r
                \r
@@ -419,9 +440,11 @@ if($errorMessages.Count -eq 0) {
                }\r
        }\r
        \r
+       # Rotate the log files\r
        Rotate-Log\r
 }\r
 \r
+# If there was any error message recorded, send a mail if configured\r
 if($emailOnError -and $errorMessages.Count -gt 0) {\r
        $emailBody  = "This is DSMonRot on $env:computername, started at $startTime.`n"\r
        $emailBody += "An error occured while performing a backup. Below are the error messages and some status information.`n`n"\r
@@ -433,7 +456,7 @@ if($emailOnError -and $errorMessages.Count -gt 0) {
        $emailBody += "Drive Snapshot command: $dsCommand`n`n"\r
        $emailBody += ($errorMessages -join "`n")\r
 \r
-       Send-Email ($emailBody)\r
+       Send-Email $emailBody\r
 }\r
 \r
 $endTime = Get-Date -format "yyyy-MM-dd HH:mm:ss"\r