Merge branch '7-error-when-non-timestamp-directory-in-backup-destination' into 'master'

Resolve "Error when non-timestamp directory in backup destination"

Closes #7

See merge request !6

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/byteback/restore.rb b/lib/byteback/restore.rb
index d313209..7055be3 100644
--- a/lib/byteback/restore.rb
+++ b/lib/byteback/restore.rb
@@ -65,11 +65,10 @@ module Byteback
 
       @results = paths.collect do |path|
         Dir.glob(File.expand_path(File.join(@byteback_root, @snapshot, path))).collect do |f|
-          restore_file = Byteback::RestoreFile.new(f, @byteback_root, @now)
+          Byteback::RestoreFile.new(f, @byteback_root, @now)
         end
       end.flatten
 
-
       #
       # If we want an unpruned list, return it now.
       #
diff --git a/lib/byteback/restore_file.rb b/lib/byteback/restore_file.rb
index 5811b0f..daceb83 100644
--- a/lib/byteback/restore_file.rb
+++ b/lib/byteback/restore_file.rb
@@ -45,10 +45,13 @@ module Byteback
       #
       @snapshot = full_path.sub(%r(^#{Regexp.escape @byteback_root}),'').split("/")[1]
 
-      if @snapshot == "current"
-        @snapshot_time = @now
-      else
+      #
+      # If we can parse the time, use it, otherwise assume "now".
+      #
+      begin
         @snapshot_time = Time.parse(@snapshot)
+      rescue ArgumentError
+        @snapshot_time = @now
       end
 
       #