Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Codereview comments from r1844

Browse Source
This commit is contained in:
David Sansome 2010-08-29 19:50:06 +00:00
parent 93b35a6379
commit ebe237cd40
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/organise.cpp
View File

@ -140,8 +140,8 @@ void Organise::ProcessSomeFiles() {
song.set_filetype(task.new_filetype_);
// Fiddle the filename extension as well to match the new type
song.set_filename(song.filename().section('.', 0, -2) + "." + task.new_extension_);
song.set_basefilename(song.basefilename().section('.', 0, -2) + "." + task.new_extension_);
song.set_filename(FiddleFileExtension(song.filename(), task.new_extension_));
song.set_basefilename(FiddleFileExtension(song.basefilename(), task.new_extension_));
// Have to set this to the size of the new file or else funny stuff happens
song.set_filesize(QFileInfo(task.transcoded_filename_).size());
@ -248,3 +248,9 @@ void Organise::FileTranscoded(const QString& filename, bool success) {
}
QTimer::singleShot(0, this, SLOT(ProcessSomeFiles()));
}
QString Organise::FiddleFileExtension(const QString& filename, const QString& new_extension) {
if (filename.section('/', -1, -1).contains('.'))
return filename.section('.', 0, -2) + "." + new_extension;
return filename + "." + new_extension;
}

4
src/core/organise.h
View File

@ -53,9 +53,11 @@ private:
void UpdateProgress();
Song::FileType CheckTranscode(Song::FileType original_type) const;
static QString FiddleFileExtension(const QString& filename, const QString& new_extension);
private:
struct Task {
Task(const QString& filename = QString()) : filename_(filename) {}
explicit Task(const QString& filename = QString()) : filename_(filename) {}
QString filename_;
QString transcoded_filename_;