From b68038797f34281ab2b7836960812a0cc02e7268 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 19 Mar 2015 17:31:26 -0400
Subject: [PATCH] added a date stamp in safedel for the output file names,
 annotated where i got it from in shared snarfer for eventual abstraction to a
 new function.

---
 scripts/archival/shared_snarfer.pl |  3 +++
 scripts/files/safedel.pl           | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl
index 4747d07e..dbf268d6 100644
--- a/scripts/archival/shared_snarfer.pl
+++ b/scripts/archival/shared_snarfer.pl
@@ -85,9 +85,12 @@ sub short_hostname {
 # a timestamp and hostname.
 sub snarf_prefix {
   local($base) = @_;
+
+#hmmm: extract this shared code to new function (also in safedel)
   $date_tool = "date";
   local($date_part) = `$date_tool +%Y-%m-%d-%H%M`;
   while ($date_part =~ /[\r\n]$/) { chop $date_part; }
+
   local($host) = &short_hostname();
   while ($host =~ /[\r\n]$/) { chop $host; }
   $base = $base . "_" . $host . "_" . $date_part;
diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index 3892cb64..c95e6621 100644
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -102,8 +102,14 @@ sub safedel {
       print "ignoring attempt to remove current or parent directory.\n";
       next;
     }
-    $tempfile = $temp_subdir . "/temp" . "$number";
+
+#hmmm: extract this shared bit of code as new method (also in shared snarfer)
+    $date_tool = "date";
+    local($datestamp) = `$date_tool +%Y-%m-%d-%H%M`;
+    while ($datestamp =~ /[\r\n]$/) { chop $datestamp; }
+    $tempfile = $temp_subdir . "/deleted-#$number-" . $datestamp;
 #print "tempfile is $tempfile; file is $file.\n";
+
     if (-d $file) {
       # ensure there aren't any read only files.
       system("chmod -R u+rw \"$file\"");
@@ -134,7 +140,11 @@ sub safedel {
     local($printable_date) = scalar(localtime());
 #&ctime(time);
     $printable_date =~ s/\n//g;
-    print REPORT $printable_date . " -- safedel: \"temp" . $number . ".zip\" <= [@deleted]\n";
+    local($just_archived_filename) = `basename "$tempfile"`;
+    while ($just_archived_filename =~ /[\r\n]$/) { chop $just_archived_filename; }
+    print REPORT "\n";
+    print REPORT $printable_date . " -- created \"" . $just_archived_filename . ".zip\"\n";
+    print REPORT $printable_date . " -- from [@deleted]\n";
     close(REPORT);
   } else {
     print "No files were deleted.\n";
-- 
2.34.1