Merge pull request #57 from oliwer/tempdir

booru: use a different TempDir for each tab
ahodesuka · Nov 8, 2017 · 2861e1c · 2861e1c
2 parents 0a3c57f + 1442340
commit 2861e1c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/src/booru/imagelist.cc b/src/booru/imagelist.cc
@@ -3,6 +3,7 @@ using namespace AhoViewer::Booru;
 
 #include "image.h"
 #include "page.h"
+#include "tempdir.h"
 
 ImageList::ImageList(Widget *w)
   : AhoViewer::ImageList(w),
@@ -11,12 +12,34 @@ ImageList::ImageList(Widget *w)
 
 }
 
+ImageList::~ImageList()
+{
+    clear();
+}
+
 void ImageList::clear()
 {
     AhoViewer::ImageList::clear();
+    if (!m_Path.empty()) {
+        TempDir::get_instance().remove_dir(m_Path);
+        m_Path.clear();
+    }
     m_Size = 0;
 }
 
+std::string ImageList::get_path()
+{
+    static int id = 1;
+
+    if (m_Path.empty())
+    {
+        m_Path = TempDir::get_instance().make_dir(std::to_string(id++));
+        g_mkdir_with_parents(Glib::build_filename(m_Path, "thumbnails").c_str(), 0755);
+    }
+
+    return m_Path;
+}
+
 void ImageList::load(const xmlDocument &posts, const Page &page)
 {
     std::string c = posts.get_attribute("count");
@@ -26,10 +49,10 @@ void ImageList::load(const xmlDocument &posts, const Page &page)
     for (const xmlDocument::Node &post : posts.get_children())
     {
         std::string thumbUrl  = post.get_attribute("preview_url"),
-                    thumbPath = Glib::build_filename(page.get_site()->get_path(), "thumbnails",
+                    thumbPath = Glib::build_filename(get_path(), "thumbnails",
                                                    Glib::uri_unescape_string(Glib::path_get_basename(thumbUrl))),
                     imageUrl  = post.get_attribute("file_url"),
-                    imagePath = Glib::build_filename(page.get_site()->get_path(),
+                    imagePath = Glib::build_filename(get_path(),
                                                    Glib::uri_unescape_string(Glib::path_get_basename(imageUrl)));
 
         std::istringstream ss(post.get_attribute("tags"));

diff --git a/src/booru/imagelist.h b/src/booru/imagelist.h
@@ -12,13 +12,16 @@ namespace AhoViewer
         {
         public:
             ImageList(Widget *w);
+            virtual ~ImageList() override;
 
+            std::string get_path();
             virtual size_t get_size() const override { return m_Size ? m_Size : AhoViewer::ImageList::get_size(); }
             size_t get_vector_size() const { return m_Images.size(); }
 
             virtual void clear() override;
             void load(const xmlDocument &posts, const Page &page);
         private:
+            std::string m_Path;
             size_t m_Size;
         };
     }

diff --git a/src/booru/site.cc b/src/booru/site.cc
@@ -1,12 +1,12 @@
 #include <chrono>
 #include <fstream>
 #include <iostream>
+#include <glib/gstdio.h>
 
 #include "site.h"
 using namespace AhoViewer::Booru;
 
 #include "settings.h"
-#include "tempdir.h"
 
 #ifdef HAVE_LIBSECRET
 #include <libsecret/secret.h>
@@ -293,17 +293,6 @@ void Site::cleanup_cookie() const
         g_unlink(m_CookiePath.c_str());
 }
 
-std::string Site::get_path()
-{
-    if (m_Path.empty())
-    {
-        m_Path = TempDir::get_instance().make_dir(m_Name);
-        g_mkdir_with_parents(Glib::build_filename(m_Path, "thumbnails").c_str(), 0755);
-    }
-
-    return m_Path;
-}
-
 Glib::RefPtr<Gdk::Pixbuf> Site::get_icon_pixbuf(const bool update)
 {
     if (!m_IconPixbuf || update)

diff --git a/src/booru/site.h b/src/booru/site.h
@@ -67,7 +67,6 @@ namespace AhoViewer
             std::string get_cookie();
             void cleanup_cookie() const;
 
-            std::string get_path();
             Glib::RefPtr<Gdk::Pixbuf> get_icon_pixbuf(const bool update = false);
 
             void save_tags() const;
@@ -95,8 +94,7 @@ namespace AhoViewer
                         m_Password,
                         m_IconPath,
                         m_TagsPath,
-                        m_CookiePath,
-                        m_Path;
+                        m_CookiePath;
             Type m_Type;
             bool m_NewAccount;
             uint64_t m_CookieTS;