Changeset 2949

Timestamp:

04/27/06 12:32:26 (3 years ago)

Author:

madcat

Message:

Fixed adding/removing shared directories.

Files:

• hydranode/hncore/fileslist.cpp (modified) (7 diffs)
• hydranode/hncore/fileslist.h (modified) (1 diff)
• hydranode/hngui/librarytabs.cpp (modified) (4 diffs)

hydranode/hncore/fileslist.cpp

@@ -65 +65 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -116 +101 @@
-
-        scanSharedDir(path, recurse);
+        m_sharedDirs[path] = recurse;
+        saveSettings();
-
-} catch (std::exception &e) {
@@ -134 +121 @@
-        }
-
-        m_tempDirs.insert(path);
-
-        if (scan) {
-                IOThread::Pauser pauser(IOThread::instance());
-                scanTempDir(path);
-        }
+        m_tempDirs.insert(path);
+        saveSettings();
+
-} catch (std::exception &e) {
-        logError(boost::format("Unable to scan temp dir: %s") % e.what());
@@ -160 +148 @@
-        // Scan through main map and locate entries which were in this
-        // directory, and destroy them.
+        std::string _path = path;
+#ifdef WIN32 // workaround for boost_filesystem library issues
+        boost::algorithm::replace_all(_path, "/", "\\");
+#endif
+
-        for (SFIter i = m_list.begin(); i != m_list.end(); ++i) {
-
+_
-                        (*i)->destroy();
-                }
-        }
+        saveSettings();
-}
-
@@ -188 +182 @@
-                }
-        }
+        saveSettings();
-}
-
@@ -236 +231 @@
-                        }
-                }
-
-
-
-
-
-
-
-
-
-
+
-        }
-
@@ -541 +527 @@
-}
-
+void FilesList::saveSettings() const {
+        std::string incDir(Prefs::instance().read<std::string>("/Incoming",""));
+#ifdef WIN32 // workaround for boost_filesystem library issues
+        boost::algorithm::replace_all(incDir, "\\", "/");
+#endif
+        if (m_sharedDirs.size()) {
+                Prefs::instance().write(
+                        "/SharedDirs/Count", m_sharedDirs.size() - 1
+                );
+                std::map<std::string, bool>::const_iterator it(
+                        m_sharedDirs.begin()
+                );
+                uint32_t cnt = 0;
+                while (it != m_sharedDirs.end()) {
+                        if ((*it).first == incDir) {
+                                ++it;
+                                continue;
+                        }
+                        boost::format fmt("/SharedDirs/Dir_%d");
+                        fmt % cnt++;
+                        Prefs::instance().write(fmt.str(), (*it).first);
+                        if ((*it).second) {
+                                Prefs::instance().write(
+                                        fmt.str() + "_recurse", true
+                                );
+                        }
+                        ++it;
+                }
+        }
+
+        std::string globTemp(Prefs::instance().read<std::string>("/Temp", ""));
+        std::set<std::string>::const_iterator it(m_tempDirs.begin());
+
+#ifdef WIN32 // workaround for boost_filesystem library issues
+        boost::algorithm::replace_all(globTemp, "\\", "/");
+#endif
+        if (m_tempDirs.size()) {
+                Prefs::instance().write("/TempCnt", m_tempDirs.size() - 1);
+                uint32_t cnt = 0;
+                while (it != m_tempDirs.end()) {
+                        if (*it == globTemp) {
+                                ++it;
+                                continue;
+                        }
+                        boost::format fmt("/Temp_%d");
+                        fmt % cnt++;
+                        Prefs::instance().write(fmt.str(), *it++);
+                }
+        }
+}

hydranode/hncore/fileslist.h

@@ -257 +257 @@
-        //! Attempt to import files from a location
-        boost::signal<void (boost::filesystem::path)> import;
+
+        //! Saves known shared/temp dirs to settings
+        void saveSettings() const;
-private:
-        void scanSharedDir(const std::string &path, bool recurse = false);

hydranode/hngui/librarytabs.cpp

@@ -97 +97 @@
-        int count = SettingsPage::instance().value("SharedDirs/Count").toInt();
-
-1; i <=
+0; i <
-                QString dirName = SettingsPage::instance().value(
-                        QString("SharedDirs/Dir_%1").arg(i)
@@ -157 +157 @@
-
-void LibraryPage::remShared() {
+        int count = SettingsPage::instance().value("SharedDirs/Count").toInt();
+        if (!count) {
+                return;
+        }
+
+        QMenu menu(this);
-        m_ui->removeButton->setCheckable(true);
-        m_ui->removeButton->setChecked(true);
-
-
-
-
+
-                QString dirName = SettingsPage::instance().value(
-                        QString("SharedDirs/Dir_%1").arg(i)
@@ -169 +173 @@
-//              dirName = dirName.replace("/", "\\");
-//#endif
-
-
-
-
+
-        }
-        QPoint pos(0, m_ui->removeButton->height());
@@ -181 +182 @@
-                LibraryList::getList()->remShared(ret->text().toStdString());
-        }
+        m_ui->removeButton->setChecked(false);
-        m_ui->removeButton->setCheckable(false);
-        m_ui->removeButton->setChecked(false);
-}
-