iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

No need to call QString.replace("/", "_") as Covers::encodeName() does this

Browse Source
This commit is contained in:
Craig Drummond
2018-02-08 18:32:17 +00:00
parent 2f25577699
commit 045f086de5
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
context/songview.cpp
View File

@@ -61,40 +61,26 @@ const QLatin1String SongView::constInfoExt(".html.gz");
static QString infoCacheFileName(const Song &song, const QString &lang, bool createDir)
{
QString artist=song.artist;
QString title=song.title;
title.replace("/", "_");
artist.replace("/", "_");
QString dir=Utils::cacheDir(SongView::constCacheDir+Covers::encodeName(artist)+Utils::constDirSep, createDir);
QString dir=Utils::cacheDir(SongView::constCacheDir+Covers::encodeName(song.artist)+Utils::constDirSep, createDir);
if (dir.isEmpty()) {
return QString();
}
return dir+Covers::encodeName(title)+"."+lang+SongView::constInfoExt;
return dir+Covers::encodeName(song.title)+"."+lang+SongView::constInfoExt;
}
static QString lyricsCacheFileName(const Song &song, bool createDir=false)
{
QString artist=song.artist;
QString title=song.title;
title.replace("/", "_");
artist.replace("/", "_");
QString dir=Utils::cacheDir(SongView::constLyricsDir+Covers::encodeName(artist)+Utils::constDirSep, createDir);
QString dir=Utils::cacheDir(SongView::constLyricsDir+Covers::encodeName(song.artist)+Utils::constDirSep, createDir);
if (dir.isEmpty()) {
return QString();
}
return dir+Covers::encodeName(title)+SongView::constExtension;
return dir+Covers::encodeName(song.title)+SongView::constExtension;
}
#if !defined Q_OS_WIN && !defined Q_OS_MAC
static QString lyricsOtherFileName(const Song &song, bool createDir=false)
static QString lyricsOtherFileName(const Song &song)
{
QString artist=song.artist;
QString title=song.title;
title.replace("/", "_");
artist.replace("/", "_");
return QDir::homePath()+"/.lyrics/"+Covers::encodeName(artist)+" - "+Covers::encodeName(title)+".txt";
return QDir::homePath()+"/.lyrics/"+Covers::encodeName(song.artist)+" - "+Covers::encodeName(song.title)+".txt";
}
#endif