Convert wrapper for tempdirectory to singleton

sgsaenger · Oct 11, 2024 · 33cf77f · 33cf77f
1 parent 2add1fd
commit 33cf77f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 29 deletions.
diff --git a/vipster/fileio.cpp b/vipster/fileio.cpp
@@ -5,29 +5,36 @@
 using namespace Vipster;
 namespace fs = std::filesystem;
 
-detail::TempWrap::TempWrap()
-    : tmppath{fs::temp_directory_path()/"vipster"}
-{
-    if(!fs::exists(tmppath)){
-        fs::create_directory(tmppath);
-    }else if(!fs::is_directory(tmppath)){
-        fs::remove(tmppath);
-        fs::create_directory(tmppath);
-    }
-}
-
-const fs::path& detail::TempWrap::getPath() const
-{
-    return tmppath;
+// RAII wrapper singleton for temp folder
+namespace Vipster::detail {
+    class TempWrap{
+    public:
+        static const std::filesystem::path& getPath()
+        {
+            static TempWrap tw{};
+            return tw.tmppath;
+        }
+    private:
+        TempWrap()
+        : tmppath{fs::temp_directory_path()/"vipster"}
+        {
+            if(!fs::exists(tmppath)){
+                fs::create_directory(tmppath);
+            }else if(!fs::is_directory(tmppath)){
+                fs::remove(tmppath);
+                fs::create_directory(tmppath);
+            }
+        }
+        TempWrap(const TempWrap&) = delete;
+        std::filesystem::path tmppath;
+    };
 }
 
 const fs::path& Vipster::getTempPath()
 {
-    return detail::tempwrap.getPath();
+    return detail::TempWrap::getPath();
 }
 
-const detail::TempWrap detail::tempwrap{};
-
 const Plugin *Vipster::guessFmt(std::string fn, const PluginList &p)
 {
     auto pos = fn.find_last_of('.');

diff --git a/vipster/fileio.h b/vipster/fileio.h
@@ -19,18 +19,7 @@ namespace Vipster{
                       const std::optional<Parameter>& p=std::nullopt,
                       const std::optional<Preset>& c=std::nullopt);
     const Plugin* guessFmt(std::string fn, const PluginList &p);
-    // RAII wrapper for temp folder
-    namespace detail {
-        class TempWrap{
-        public:
-            TempWrap();
-            const std::filesystem::path& getPath() const;
-        private:
-            TempWrap(const TempWrap&) = delete;
-            std::filesystem::path tmppath;
-        };
-        extern const TempWrap tempwrap;
-    }
+
     const std::filesystem::path& getTempPath();
 }