Use QFileInfo::completeBaseName() instead of QFileInfo::baseName()
Fixes #550
This commit is contained in:
parent
5877aa822c
commit
e22d463d11
|
@ -87,7 +87,7 @@ QStringList MoodbarLoader::MoodFilenames(const QString& song_filename) {
|
||||||
|
|
||||||
const QFileInfo file_info(song_filename);
|
const QFileInfo file_info(song_filename);
|
||||||
const QString dir_path(file_info.dir().path());
|
const QString dir_path(file_info.dir().path());
|
||||||
const QString mood_filename = file_info.baseName() + ".mood";
|
const QString mood_filename = file_info.completeBaseName() + ".mood";
|
||||||
|
|
||||||
return QStringList() << dir_path + "/." + mood_filename << dir_path + "/" + mood_filename;
|
return QStringList() << dir_path + "/." + mood_filename << dir_path + "/" + mood_filename;
|
||||||
|
|
||||||
|
|
|
@ -193,14 +193,14 @@ void PlaylistManager::Load(const QString &filename) {
|
||||||
|
|
||||||
QFileInfo info(filename);
|
QFileInfo info(filename);
|
||||||
|
|
||||||
int id = playlist_backend_->CreatePlaylist(info.baseName(), QString());
|
int id = playlist_backend_->CreatePlaylist(info.completeBaseName(), QString());
|
||||||
|
|
||||||
if (id == -1) {
|
if (id == -1) {
|
||||||
emit Error(tr("Couldn't create playlist"));
|
emit Error(tr("Couldn't create playlist"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Playlist *playlist = AddPlaylist(id, info.baseName(), QString(), QString(), false);
|
Playlist *playlist = AddPlaylist(id, info.completeBaseName(), QString(), QString(), false);
|
||||||
|
|
||||||
QList<QUrl> urls;
|
QList<QUrl> urls;
|
||||||
playlist->InsertUrls(urls << QUrl::fromLocalFile(filename));
|
playlist->InsertUrls(urls << QUrl::fromLocalFile(filename));
|
||||||
|
|
|
@ -292,7 +292,7 @@ QString Transcoder::GetFile(const QString &input, const TranscoderPreset &preset
|
||||||
|
|
||||||
if (!fileinfo_output.isFile() || fileinfo_output.filePath().isEmpty() || fileinfo_output.path().isEmpty() || fileinfo_output.fileName().isEmpty() || fileinfo_output.suffix().isEmpty()) {
|
if (!fileinfo_output.isFile() || fileinfo_output.filePath().isEmpty() || fileinfo_output.path().isEmpty() || fileinfo_output.fileName().isEmpty() || fileinfo_output.suffix().isEmpty()) {
|
||||||
QFileInfo fileinfo_input(input);
|
QFileInfo fileinfo_input(input);
|
||||||
QString filename = fileinfo_input.baseName() + "." + preset.extension_;
|
QString filename = fileinfo_input.completeBaseName() + "." + preset.extension_;
|
||||||
fileinfo_output.setFile(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/transcoder/" + filename);
|
fileinfo_output.setFile(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/transcoder/" + filename);
|
||||||
QDir dir;
|
QDir dir;
|
||||||
dir.mkdir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/transcoder");
|
dir.mkdir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/transcoder");
|
||||||
|
@ -301,7 +301,7 @@ QString Transcoder::GetFile(const QString &input, const TranscoderPreset &preset
|
||||||
// Never overwrite existing files
|
// Never overwrite existing files
|
||||||
if (fileinfo_output.exists()) {
|
if (fileinfo_output.exists()) {
|
||||||
QString path = fileinfo_output.path();
|
QString path = fileinfo_output.path();
|
||||||
QString filename = fileinfo_output.baseName();
|
QString filename = fileinfo_output.completeBaseName();
|
||||||
QString suffix = fileinfo_output.suffix();
|
QString suffix = fileinfo_output.suffix();
|
||||||
for (int i = 0;; ++i) {
|
for (int i = 0;; ++i) {
|
||||||
QString new_filename = QString("%1/%2-%3.%4").arg(path).arg(filename).arg(i).arg(suffix);
|
QString new_filename = QString("%1/%2-%3.%4").arg(path).arg(filename).arg(i).arg(suffix);
|
||||||
|
|
|
@ -105,7 +105,7 @@ MimeData *FileViewList::MimeDataFromSelection() const {
|
||||||
mimedata->name_for_new_playlist_ = QDir(info.filePath()).dirName();
|
mimedata->name_for_new_playlist_ = QDir(info.filePath()).dirName();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mimedata->name_for_new_playlist_ = info.baseName();
|
mimedata->name_for_new_playlist_ = info.completeBaseName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue