Changeset 552 for trunk

Timestamp:

08/17/08 10:00:33 (12 years ago)

Author:

Eoin

Message:

 

Location:

trunk/src

Files:

• ConfigOptions.cpp (modified) (2 diffs)
• Halite.cpp (modified) (1 diff)
• NewTorrentDialog.cpp (modified) (4 diffs)
• advtabs/Files.hpp (modified) (1 diff)
• global/txml_iarchive.hpp (modified) (2 diffs)
• global/txml_oarchive.hpp (modified) (1 diff)
• global/wtl_app.cpp (modified) (1 diff)
• halConfig.hpp (modified) (1 diff)
• halEvent.cpp (modified) (1 diff)
• halSession.hpp (modified) (5 diffs)
• halTorrent.hpp (modified) (1 diff)

trunk/src/ConfigOptions.cpp

@@ -41 +41 @@
                                 hal::xp::wsmatch what;
 
-                                if(hal::xp::regex_match(dir_itr->path().leaf(), what, rex))
+                                if(hal::xp::regex_match(dir_itr->path().filename(), what, rex))
                                 {
                                         HMODULE hMod = ::LoadLibraryEx(dir_itr->path().string().c_str(), 0, LOAD_LIBRARY_AS_DATAFILE);
@@ -53 +53 @@
                                         {
                                                 wstring lang_name(buffer.elems);
-                                                lang_map_[lang_name] = dir_itr->path().leaf();
+                                                lang_map_[lang_name] = dir_itr->path().filename();
                                                 int index = lang_list_.AddString(lang_name.c_str());
                                                 
-                                                if (dir_itr->path().leaf() == halite().dll_) 
+                                                if (dir_itr->path().filename() == halite().dll_) 
                                                         lang_list_.SetCurSel(index);
                                         }

trunk/src/Halite.cpp

@@ -37 +37 @@
         void operator()(shared_ptr<hal::EventDetail> event)
         {
-                if (true || halite().logToFile())
+                if (halite().logToFile())
                 {
                         if (!wofs.is_open()) wofs.open(hal::app().working_directory()/L"HaliteLog.txt");

trunk/src/NewTorrentDialog.cpp

@@ -103 +103 @@
     {
                 for (hal::fs::wdirectory_iterator i(currentDir), end; i != end; ++i)
-                        recurseDirectory(files, baseDir, relDir / i->leaf());
+                        recurseDirectory(files, baseDir, relDir / i->filename());
     }
     else
     {
-                files.push_back(baseDir.leaf()/relDir);         
+                files.push_back(baseDir.filename()/relDir);             
     }
 }
@@ -120 +120 @@
                 wpath file = wpath(dlgOpen.m_ofn.lpstrFile);
 
-                fileRoot_ = file.branch_path();         
-                files_.push_back(file.leaf());
+                fileRoot_ = file.parent_path();         
+                files_.push_back(file.filename());
 
                 UpdateFileList();
-                SetDlgItemText(HAL_NEWT_FILE_NAME_EDIT, file.leaf().c_str());
+                SetDlgItemText(HAL_NEWT_FILE_NAME_EDIT, file.filename().c_str());
         }
 
@@ -146 +146 @@
                 files_.clear();
 
-                fileRoot_ = wpath(fldDlg.m_szFolderPath).branch_path();
+                fileRoot_ = wpath(fldDlg.m_szFolderPath).parent_path();
                 recurseDirectory(files_, wpath(fldDlg.m_szFolderPath), L"");
 
                 UpdateFileList();               
-                SetDlgItemText(HAL_NEWT_FILE_NAME_EDIT, fileRoot_.leaf().c_str());
+                SetDlgItemText(HAL_NEWT_FILE_NAME_EDIT, fileRoot_.filename().c_str());
         }
 
@@ -167 +167 @@
         foreach(wpath& file, files_)
         {
-                int itemPos = filesList_.AddItem(0, 0, file.leaf().c_str(), 0);
-
-                filesList_.SetItemText(itemPos, 1, file.branch_path().file_string().c_str());
+                int itemPos = filesList_.AddItem(0, 0, file.filename().c_str(), 0);
+
+                filesList_.SetItemText(itemPos, 1, file.parent_path().file_string().c_str());
                 filesList_.SetItemText(itemPos, 2, lexical_cast<wstring>(
                         hal::fs::file_size(fileRoot_/file)).c_str());

trunk/src/advtabs/Files.hpp

@@ -324 +324 @@
                         {
                                 (*i).second.valid = true;
-                                EnsureValid(branchPath.branch_path());
+                                EnsureValid(branchPath.parent_path());
                         }
                 }

trunk/src/global/txml_iarchive.hpp

@@ -212 +212 @@
 
                         if (previous_child_node_ &&
-                                        previous_child_branch_ == location.branch_path())
+                                        previous_child_branch_ == location.parent_path())
                         {
                         //      TXML_LOG(boost::wformat(L" << previous_child: %1%") % previous_child_node_->to_element()->get_text());
-                                failsafe_current = previous_child_node_->next_sibling(location.leaf());
+                                failsafe_current = previous_child_node_->next_sibling(location.filename());
                                 previous_child_node_ = 0;
                                 
                                 if (!failsafe_current) 
-                                        failsafe_current = current_node_->first_child(location.leaf());;
+                                        failsafe_current = current_node_->first_child(location.filename());;
                         }
                         else
@@ -250 +250 @@
                                 current_node_ = failsafe_current;
 
-                                previous_child_branch_ = location.branch_path();
+                                previous_child_branch_ = location.parent_path();
                         }
                 }

trunk/src/global/txml_oarchive.hpp

@@ -193 +193 @@
                         boost::filesystem::path branch(name);
 
-                        std::string leaf = branch.leaf();
-                        branch = branch.branch_path();
+                        std::string leaf = branch.filename();
+                        branch = branch.parent_path();
 
                         foreach(std::string elem, branch)

trunk/src/global/wtl_app.cpp

@@ -67 +67 @@
                                 command_args_.push_back(szArglist[i]);
                                 
-                        working_directory_ = exe_path_.branch_path();
+                        working_directory_ = exe_path_.parent_path();
                 }               
                 LocalFree(szArglist);   

trunk/src/halConfig.hpp

@@ -40 +40 @@
                 enableProxy(false),
                 proxyPort(0),
-                default_save_folder_((hal::app().exe_path().branch_path()/L"incoming").string()),
-                default_move_folder_((hal::app().exe_path().branch_path()/L"completed").string()),
+                default_save_folder_((hal::app().exe_path().parent_path()/L"incoming").string()),
+                default_move_folder_((hal::app().exe_path().parent_path()/L"completed").string()),
                 use_move_to_(false),
                 save_prompt_(true),

trunk/src/halEvent.cpp

@@ -80 +80 @@
         {
         mutex_t::scoped_lock l(pimpl_->mutex_);
-        if (e->level() != hal::event_logger::debug || halite().logDebug() || true)
+        if (e->level() != hal::event_logger::debug || halite().logDebug())
                 pimpl_->event_signal_(e);
         }

trunk/src/halSession.hpp

@@ -638 +638 @@
                 wstring xml_name = from_utf8(names.first) + L".xml";
 
-                if (false && fs::exists(file.branch_path()/xml_name))
+                if (false && fs::exists(file.parent_path()/xml_name))
                 {
                         torrent_standalone tsa;
                         
-                        if (tsa.load_standalone(file.branch_path()/xml_name))
+                        if (tsa.load_standalone(file.parent_path()/xml_name))
                         {
                                 TIp = tsa.torrent;
@@ -697 +697 @@
                 
                 wpath torrentFilename = torrentName;
-                const wpath resumeFile = workingDirectory/L"resume"/torrentFilename.leaf();
+                const wpath resumeFile = workingDirectory/L"resume"/torrentFilename.filename();
                 
                 //  vvv Handle old naming style!
-                const wpath oldResumeFile = workingDirectory/L"resume"/filename.leaf();
-                
-                if (filename.leaf() != torrentFilename.leaf() && exists(oldResumeFile))
+                const wpath oldResumeFile = workingDirectory/L"resume"/filename.filename();
+                
+                if (filename.filename() != torrentFilename.filename() && exists(oldResumeFile))
                         fs::rename(oldResumeFile, resumeFile);
                 //  ^^^ Handle old naming style!        
@@ -726 +726 @@
                         fs::create_directory(workingDirectory/L"torrents");
 
-                if (!fs::exists(workingDirectory/L"torrents"/torrentFilename.leaf()))
-                        fs::copy_file(filename.string(), workingDirectory/L"torrents"/torrentFilename.leaf());
+                if (!fs::exists(workingDirectory/L"torrents"/torrentFilename.filename()))
+                        fs::copy_file(filename.string(), workingDirectory/L"torrents"/torrentFilename.filename());
 
                 if (!fs::exists(saveDirectory))
@@ -761 +761 @@
                                 {
                                         std::string p = (hal::path_to_utf8(pIT->saveDirectory()) / i->path).string();
-                                        fs::path bp = i->path.branch_path();
+                                        fs::path bp = i->path.parent_path();
                                         
                                         std::pair<std::set<std::string>::iterator, bool> ret;
@@ -769 +769 @@
                                                 std::pair<std::set<std::string>::iterator, bool> ret = 
                                                         directories.insert((hal::path_to_utf8(pIT->saveDirectory()) / bp).string());
-                                                bp = bp.branch_path();
+                                                bp = bp.parent_path();
                                         }
                                         if (!fs::remove(hal::from_utf8(p).c_str()) && errno != ENOENT)

trunk/src/halTorrent.hpp

@@ -266 +266 @@
 {
         FileDetail(boost::filesystem::wpath p, boost::int64_t s=0, float pg=0, int pr=1, size_t o=0, unsigned t=FileDetail::file) :
-                branch(p.branch_path()),
-                filename(p.leaf()),
+                branch(p.parent_path()),
+                filename(p.filename()),
                 type(t),
                 size(s),