Changeset 304

Timestamp:

09/22/07 19:31:07 (13 years ago)

Author:

Eoin

Message:

Re-jiggyed the Torrents.xml to modular BitTorrent?.xml

Location:

src

Files:

• halTorrent.cpp (modified) (5 diffs)
• halTorrentInternal.hpp (modified) (11 diffs)

src/halTorrent.cpp

@@ -6 +6 @@
 
 
-#define HALITE_VERSION                                  0,2,9,293
-#define HALITE_VERSION_STRING                   "v 0.2.9 dev 293"
+#define HALITE_VERSION                                  0,2,9,304
+#define HALITE_VERSION_STRING                   "v 0.2.9 dev 304"
 
 #define LBT_EVENT_TORRENT_FINISHED                                      80001
@@ -539 +539 @@
                 {
                 
-                fs::wofstream ofs(workingDirectory/L"Torrents.xml");
-                boost::archive::xml_woarchive oxa(ofs);
-                
-                oxa << make_nvp("theTorrents", theTorrents);
+//              fs::wofstream ofs(workingDirectory/L"Torrents.xml");
+//              boost::archive::xml_woarchive oxa(ofs);
+                
+//              oxa << make_nvp("theTorrents", theTorrents);
+                
+                theTorrents.save();
+                bittorrentIni.save_data();
                         
                 if (dht_on_) 
@@ -584 +587 @@
                 TorrentInternal::the_session_ = &theSession;
                 
-                theSession.set_severity_level(lbt::alert::debug);
-                
+                theSession.set_severity_level(lbt::alert::debug);               
                 theSession.add_extension(&lbt::create_metadata_plugin);
                 theSession.add_extension(&lbt::create_ut_pex_plugin);
                 theSession.set_max_half_open_connections(10);
                 
-                /*
-                bool tryOld = false;
-                
+                bittorrentIni.load_data();
+                theTorrents.load();
+                                        
                 try
-                {
-                
-                fs::wifstream ifs(workingDirectory/L"BitTorrent.xml");
-                if (ifs)
-                {
-                        boost::archive::xml_wiarchive ia(ifs);                                          
-                        ia >> make_nvp("theTorrents", theTorrents);     
-                }
-                
-                }
-                catch (const boost::archive::archive_exception& e)
-                {
-                        tryOld = true;
+                {                                               
+                if (fs::exists(workingDirectory/L"Torrents.xml"))
+                {
+                        {
+                        fs::wifstream ifs(workingDirectory/L"Torrents.xml");
+                
+                        event().post(shared_ptr<EventDetail>(new EventMsg(L"Loading old Torrents.xml")));
+                
+                        TorrentMap torrents;
+                        boost::archive::xml_wiarchive ia(ifs);  
+                        ia >> make_nvp("torrents", torrents);
+                        
+                        theTorrents = torrents;
+                        }
+                        
+                        event().post(shared_ptr<EventDetail>(new EventMsg(
+                                wformat(L"Total %1%.") % theTorrents.size())));                         
+                        
+                        fs::rename(workingDirectory/L"Torrents.xml", workingDirectory/L"Torrents.xml.safe.to.delete");
+                }                       
                 }
                 catch(const std::exception& e)
                 {
                         event().post(shared_ptr<EventDetail>(
-                                new EventStdException(Event::fatal, e, L"Loading Torrents.xml")));
-                }
-                
-                if (tryOld)
-                {
-                        try
-                        {
-                                        
-                        fs::wifstream ifs(workingDirectory/L"Torrents.xml");            
-                        if (ifs)
-                        {
-                                TorrentMap torrents;
-                                boost::archive::xml_wiarchive ia(ifs);  
-                                ia >> make_nvp("torrents", torrents);
+                                new EventStdException(Event::fatal, e, L"Loading Old Torrents.xml")));
+                }               
                                 
-                                theTorrents = torrents;
-                        }       
-                                
-                        }
-                        catch(const std::exception& e)
-                        {
-                                event().post(shared_ptr<EventDetail>(
-                                        new EventStdException(Event::fatal, e, L"Loading Old Torrents.xml")));
-                        }
-                }
-                
-                */
                 if (exists(workingDirectory/L"DHTState.bin"))
                 {
@@ -1268 +1253 @@
         mutex_t::scoped_lock l(torrentDetails_.mutex_); 
         
-        torrentDetails_.clearAll(l);
-        
-//      torrentDetails_.torrents_.reserve(pimpl->torrents.size());
+        torrentDetails_.clearAll(l);    
+        torrentDetails_.torrents_.reserve(pimpl->theTorrents.size());
         
         for (TorrentManager::torrentByName::iterator i=pimpl->theTorrents.begin(), e=pimpl->theTorrents.end(); i != e; ++i)
@@ -1300 +1284 @@
         for (TorrentManager::torrentByName::iterator i=pimpl->theTorrents.begin(), e=pimpl->theTorrents.end(); i != e;)
         {
-                wpath file = wpath(pimpl->workingDirectory)/L"torrents"/wpath((*i).torrent.filename());;
-                
-                //  vvv Handle old naming style!
-                if ((*i).torrent.originalFilename() != L"")
-                        file = wpath(pimpl->workingDirectory)/L"torrents"/wpath((*i).torrent.originalFilename());
-                //  ^^^ Handle old naming style!        
-                
+                wpath file = wpath(pimpl->workingDirectory)/L"torrents"/(*i).torrent.filename();
+                                
                 if (exists(file))
                 {               

src/halTorrentInternal.hpp

@@ -40 +40 @@
 #include <boost/multi_index/tag.hpp>
 
+#include "HaliteIni.hpp"
+
 namespace hal 
 {
@@ -45 +47 @@
 }
 
-BOOST_CLASS_VERSION(hal::TorrentInternal, 10)
+BOOST_CLASS_VERSION(hal::TorrentInternal, 7)
 
 namespace hal 
@@ -192 +194 @@
         private:
                 TransferTracker<boost::posix_time::time_duration> total_;       
-                mutable boost::posix_time::ptime start_;
-                
+                mutable boost::posix_time::ptime start_;                
         };
         
@@ -210 +211 @@
                 
         TorrentInternal() :     
-                TORRENT_INTERNALS_DEFAULTS,             
+                TORRENT_INTERNALS_DEFAULTS,
+                compactStorage_(true),
                 in_session_(false)
         {}
@@ -411 +413 @@
         ar & make_nvp("transferLimit", transferLimit_);
         ar & make_nvp("connections", connections_);
-        ar & make_nvp("uploads", uploads_);             
-                if (version > 8) {
+        ar & make_nvp("uploads", uploads_);     
+                
+                if (version > 6) {
                         ar & make_nvp("filename", filename_);
                 }
-                else {
-                        ar & make_nvp("filename", originalFilename_);
-                }
+                else 
+                {
+                        wstring originalFilename;
+                        ar & make_nvp("filename", originalFilename);
+                        
+                        updatePreVersion7Files(originalFilename);
+                }
+                
         ar & make_nvp("saveDirectory", save_directory_);
                 
@@ -455 +463 @@
                 }
                 if (version > 6) {
-                        ar & make_nvp("name", name_);           
-                }
-                else {
-                        name_ = filename_;
-                }
-                if (version > 7) {
-                        ar & make_nvp("compactStorage", compactStorage_);               
-                }       
-                if (version > 9) {
-                        ar & make_nvp("finishTime", finishTime_);               
-                }               
+                        ar & make_nvp("name", name_);
+                        ar & make_nvp("compactStorage", compactStorage_);
+                        ar & make_nvp("finishTime", finishTime_);
+                }
     }
+        
+        void updatePreVersion7Files(wstring originalFilename)
+        {
+                try 
+                {
+
+                wpath oldFile = app().working_directory()/L"torrents"/originalFilename;
+                
+                if (exists(oldFile)) 
+                        extractNames(haldecode(oldFile));
+                
+                wpath oldResumeFile = app().working_directory()/L"resume"/originalFilename;
+                
+                if (filename_ != originalFilename)
+                {
+                        fs::rename(oldFile, app().working_directory()/L"torrents"/filename_);
+                        
+                        if (fs::exists(oldResumeFile))
+                                fs::rename(oldResumeFile, app().working_directory()/L"resume"/filename_);
+                }
+                
+                }
+                catch(std::exception &e) 
+                {               
+                        hal::event().post(boost::shared_ptr<hal::EventDetail>(
+                                new hal::EventStdException(Event::critical, e, L"updatePreVersion7Files"))); 
+                }
+        }
         
         void setEntryData(libtorrent::entry metadata, libtorrent::entry resumedata)
@@ -523 +552 @@
         void prepare(wpath filename, wpath saveDirectory, wpath workingDirectory)
         {
-                metadata_ = haldecode(filename);
-                lbt::torrent_info info_(metadata_);
-                
-                name_ = hal::from_utf8_safe(info_.name());
-                
-                filename_ = name_;
-                
-                if (!boost::find_last(filename_, L".torrent")) 
-                        filename_ += L".torrent";               
-                
                 const wpath resumeFile = workingDirectory/L"resume"/filename_;
-                
-                //  vvv Handle old naming style!
-                const wpath oldResumeFile = workingDirectory/L"resume"/filename.leaf();
-                
-                if (resumeFile != oldResumeFile && !exists(resumeFile) && exists(oldResumeFile))
-                        fs::rename(oldResumeFile, resumeFile);
-                //  ^^^ Handle old naming style!        
-        
+                const wpath torrentFile = workingDirectory/L"torrents"/filename_;
+                
+                event().post(shared_ptr<EventDetail>(new EventMsg(
+                                        wformat(L"File: %1%, %2%.") % resumeFile % torrentFile)));
+                
                 if (exists(resumeFile)) 
-                {
-                        try 
-                        {
-                                resumedata_ = haldecode(resumeFile);
-                        }
-                        catch(std::exception &e) 
-                        {               
-                                hal::event().post(boost::shared_ptr<hal::EventDetail>(
-                                        new hal::EventStdException(Event::critical, e, L"prepTorrent, Resume"))); 
-                
-                                remove(resumeFile);
-                        }
-                }
+                        resumedata_ = haldecode(resumeFile);
+                if (exists(filename)) 
+                        metadata_ = haldecode(filename);
 
                 if (!exists(workingDirectory/L"torrents"))
                         create_directory(workingDirectory/L"torrents");
 
-                if (!exists(workingDirectory/L"torrents"/filename_))
-                        copy_file(filename.string(), workingDirectory/L"torrents"/filename_);
+                if (!exists(torrentFile))
+                        copy_file(filename.string(), torrentFile);
 
                 if (!exists(saveDirectory))
-                        create_directory(saveDirectory);        
+                        create_directory(saveDirectory);
+                        
+                extractNames(metadata_);                        
+        }
+        
+        void extractNames(lbt::entry& metadata)
+        {
+                lbt::torrent_info info(metadata);                               
+                name_ = hal::from_utf8_safe(info.name());
+                        
+                filename_ = name_;
+                if (!boost::find_last(filename_, L".torrent")) 
+                                filename_ += L".torrent";
+                
+                event().post(shared_ptr<EventDetail>(new EventMsg(
+                        wformat(L"Loaded names: %1%, %2%") % name_ % filename_)));
         }
 
@@ -704 +725 @@
 typedef std::pair<std::string, TorrentInternal> TorrentPair;
 
-class TorrentManager : public ini_adapter
+class TorrentManager : 
+        public CHaliteIni<TorrentManager>
 {
+        typedef TorrentManager thisClass;
+        typedef CHaliteIni<thisClass> iniClass;
+        
         struct TorrentHolder
         {
@@ -755 +780 @@
         
         TorrentManager(ini_file& ini) :
-                ini_adapter("manager", ini)
+                iniClass("bittorrent", "TorrentManager", ini)
         {}
         
@@ -763 +788 @@
                 
                 for (TorrentMap::const_iterator i=map.begin(), e=map.end(); i != e; ++i)
-                {
+                {               
+                        event().post(shared_ptr<EventDetail>(new EventMsg(
+                                wformat(L"Converting %1%.") % (*i).second.name())));
+                        
                         torrents_.insert(TorrentHolder((*i).second));
                 }
+                
+                return *this;
         }
         
@@ -814 +844 @@
         {
                 return torrents_.get<byName>().erase(where);
+        }
+        
+        size_t size()
+        {
+                return torrents_.size();
         }