Create output directory if string contains slash + fix typo affecting…

… building with older compilers
bepaald · Jun 28, 2021 · f3db274 · f3db274
1 parent e8ed688
commit f3db274
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/autoversion.h b/autoversion.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define VERSIONDATE "20210611.164219"
+#define VERSIONDATE "20210628.222742"
 
 #endif
diff --git a/main.cc b/main.cc
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
     return 1;
   }
 
+  // check output exists (file exists OR dir is not empty)
   if (!arg.output().empty() && bepaald::fileOrDirExists(arg.output()) &&
       ((!bepaald::isDir(arg.output()) || (bepaald::isDir(arg.output()) && !bepaald::isEmpty(arg.output()))) &&
        !arg.overwrite()))

diff --git a/signalbackup/exporttodir.cc b/signalbackup/exporttodir.cc
@@ -125,7 +125,7 @@ bool SignalBackup::exportBackupToDir(std::string const &directory, bool overwrit
     for (int count = 1; auto const &kvframe : d_keyvalueframes)
 #else
       count = 1;
-    for (auto const &fvframe : d_keyvalueframes)
+    for (auto const &kvframe : d_keyvalueframes)
 #endif
       if (!writeRawFrameDataToFile(directory + "/KeyValue_" + bepaald::toString(count++) + ".sbf", kvframe))
         return false;

diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h
@@ -178,8 +178,25 @@ inline SignalBackup::SignalBackup(std::string const &filename, std::string const
 inline bool SignalBackup::exportBackup(std::string const &filename, std::string const &passphrase, bool overwrite,
                                        bool keepattachmentdatainmemory, bool onlydb)
 {
+  // if output is existing directory
   if (bepaald::fileOrDirExists(filename) && bepaald::isDir(filename))
     return exportBackupToDir(filename, overwrite, keepattachmentdatainmemory, onlydb);
+
+  // if output does not exist, but ends in directory delimiter
+  if (!bepaald::fileOrDirExists(filename) &&
+      (filename.back() == '/' || filename.back() == std::filesystem::path::preferred_separator))
+  {
+    // create dir
+    std::error_code ec;
+    if (!std::filesystem::create_directory(filename, ec))
+    {
+      std::cout << "Error: Failed to create directory \"" << filename << "\"" << std::endl;
+      return false;
+    }
+    return exportBackupToDir(filename, overwrite, keepattachmentdatainmemory, onlydb);
+  }
+
+  // export to file
   return exportBackupToFile(filename, passphrase, overwrite, keepattachmentdatainmemory);
 }