Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actions: edit directory name: use boost::filesystem

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-04-18 21:03:06 +02:00
parent 79449dac3c
commit 37980c9af0
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/actions.cpp
View File

@@ -23,6 +23,7 @@
#include <cstring> #include <cstring>
#include <boost/array.hpp> #include <boost/array.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/locale/conversion.hpp> #include <boost/locale/conversion.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <algorithm> #include <algorithm>
@@ -1423,10 +1424,10 @@ bool EditDirectoryName::canBeRun() const
void EditDirectoryName::run() void EditDirectoryName::run()
{ {
using Global::wFooter; using Global::wFooter;
// FIXME: use boost::filesystem and better error reporting
if (myScreen == myBrowser) if (myScreen == myBrowser)
{ {
std::string old_dir = myBrowser->main().current()->value().directory().path(), new_dir; std::string old_dir = myBrowser->main().current()->value().directory().path();
std::string new_dir;
{ {
Statusbar::ScopedLock slock; Statusbar::ScopedLock slock;
Statusbar::put() << NC::Format::Bold << "Directory: " << NC::Format::NoBold; Statusbar::put() << NC::Format::Bold << "Directory: " << NC::Format::NoBold;
@@ -1442,20 +1443,12 @@ void EditDirectoryName::run()
if (!myBrowser->isLocal()) if (!myBrowser->isLocal())
full_new_dir += Config.mpd_music_dir; full_new_dir += Config.mpd_music_dir;
full_new_dir += new_dir; full_new_dir += new_dir;
int rename_result = rename(full_old_dir.c_str(), full_new_dir.c_str()); boost::filesystem::rename(full_old_dir, full_new_dir);
if (rename_result == 0) const char msg[] = "Directory renamed to \"%1%\"";
{ Statusbar::printf(msg, wideShorten(new_dir, COLS-const_strlen(msg)));
const char msg[] = "Directory renamed to \"%1%\""; if (!myBrowser->isLocal())
Statusbar::printf(msg, wideShorten(new_dir, COLS-const_strlen(msg))); Mpd.UpdateDirectory(getSharedDirectory(old_dir, new_dir));
if (!myBrowser->isLocal()) myBrowser->requestUpdate();
Mpd.UpdateDirectory(getSharedDirectory(old_dir, new_dir));
myBrowser->requestUpdate();
}
else
{
const char msg[] = "Couldn't rename \"%1%\": %s";
Statusbar::printf(msg, wideShorten(old_dir, COLS-const_strlen(msg)-25), strerror(errno));
}
} }
} }
# ifdef HAVE_TAGLIB_H # ifdef HAVE_TAGLIB_H