recoll / Code / Diff of /src/utils/rclutil.cpp

Diff of /src/utils/rclutil.cpp [9f4e2e] .. [beebb1]

Switch to unified view

-a/src/utils/rclutil.cpp
+b/src/utils/rclutil.cpp
 ...
 #include "rclutil.h"
 #include "pathut.h"
 #include "wipedir.h"
 #include "transcode.h"
 #include "md5ut.h"
+#include "log.h"
 using namespace std;
 void map_ss_cp_noshr(const map<string, string> s, map<string, string> *d)
 ...
 #endif
     return true;
+}
+class TempFile::Internal {
+public:
+    Internal(const std::string& suffix);
+    ~Internal();
+    friend class TempFile;
+private:
+    std::string m_filename;
+    std::string m_reason;
+    bool m_noremove{false};
+};
+TempFile::TempFile(const string& suffix)
+    : m(new Internal(suffix))
+{
+}
+TempFile::TempFile()
+{
+    m = std::shared_ptr<Internal>();
+}
+const char *TempFile::filename() const
+{
+    return m ? m->m_filename.c_str() : "";
+}
+const std::string& TempFile::getreason() const
+{
+    static string fatal{"fatal error"};
+    return m ? m->m_reason : fatal;
+}
+void TempFile::setnoremove(bool onoff)
+{
+    if (m)
+        m->m_noremove = onoff;
+}
+bool TempFile::ok() const
+{
+    return m ? !m->m_filename.empty() : false;
+}
-TempFileInternal::TempFileInternal(const string& suffix)
+TempFile::Internal::Internal(const string& suffix)
-    : m_noremove(false)
+{
     // Because we need a specific suffix, can't use mkstemp
     // well. There is a race condition between name computation and
     // file creation. try to make sure that we at least don't shoot
     // our own selves in the foot. maybe we'll use mkstemps one day.
 ...
         m_reason = string("Could not open/create") + m_filename;
         m_filename.erase();
+    }
+}
-TempFileInternal::~TempFileInternal()
+TempFile::Internal::~Internal()
+{
     if (!m_filename.empty() && !m_noremove) {
         unlink(m_filename.c_str());
+    }
+}
 ...
+{
     if (!maketmpdir(m_dirname, m_reason)) {
         m_dirname.erase();
         return;
+    }
+    LOGDEB("TempDir::TempDir: -> " << m_dirname << endl);
+}
 TempDir::~TempDir()
+{
     if (!m_dirname.empty()) {
+        LOGDEB("TempDir::~TempDir: erasing " << m_dirname << endl);
         (void)wipedir(m_dirname, true, true);
         m_dirname.erase();
+    }
+}