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

Fix context view for local files

Browse Source 
Closes #1207
This commit is contained in:
Craig Drummond
2018-02-13 18:54:25 +00:00
committed by Craig Drummond
parent 56cece560f
commit 151d2bbc61
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
context/albumview.cpp
View File

@@ -185,6 +185,13 @@ void AlbumView::playSong(const QUrl &url)
void AlbumView::getTrackListing()
{
if (currentSong.isNonMPD()) {
if (!pic.isEmpty()) {
updateDetails();
}
return;
}
if (songs.isEmpty()) {
songs=MpdLibraryModel::self()->getAlbumTracks(currentSong);
}

32
context/songview.cpp
View File

@@ -52,6 +52,7 @@
#include <QTimer>
#include <QScrollBar>
#include <QDesktopServices>
#include <QUrl>
#include <QUrlQuery>
const QLatin1String SongView::constLyricsDir("lyrics/");
@@ -99,15 +100,6 @@ static inline QString fixNewLines(const QString &o)
return QString(o).replace(QLatin1String("\n\n\n"), QLatin1String("\n\n")).replace("\n", "<br/>");
}
static QString actualFile(const Song &song)
{
QString songFile=song.filePath();
if (song.isCantataStream()) {
QUrl(songFile).path();
}
return songFile;
}
SongView::SongView(QWidget *p)
: View(p, QStringList() << tr("Lyrics") << tr("Information") << tr("Metadata"))
, scrollTimer(nullptr)
@@ -364,11 +356,11 @@ void SongView::loadLyrics()
}
lyricsNeedsUpdating=false;
if (!MPDConnection::self()->getDetails().dir.isEmpty() && !currentSong.file.isEmpty() && !currentSong.isNonMPD()) {
QString songFile=actualFile(currentSong);
if (currentSong.isCantataStream() || (!MPDConnection::self()->getDetails().dir.isEmpty() && !currentSong.file.isEmpty() && !currentSong.isNonMPD())) {
QString songFile=currentSong.filePath(MPDConnection::self()->getDetails().dir);
QString mpdLyrics=mpdLyricsFilePath(songFile);
if (MPDConnection::self()->getDetails().dir.startsWith(QLatin1String("http:/"))) {
if (!currentSong.isCantataStream() && MPDConnection::self()->getDetails().dir.startsWith(QLatin1String("http:/"))) {
QUrl url(mpdLyrics);
job=NetworkAccessManager::self()->get(url);
job->setProperty("file", currentSong.file);
@@ -499,8 +491,8 @@ void SongView::loadMetadata()
QMultiMap<int, QString> tags;
QMultiMap<int, QString> audioProperties;
#ifdef TAGLIB_FOUND
if (!currentSong.isStandardStream() && !MPDConnection::self()->getDetails().dir.startsWith(QLatin1String("http:/"))) {
QString songFile=actualFile(currentSong);
if (currentSong.isCantataStream() || (!currentSong.isStandardStream() && !MPDConnection::self()->getDetails().dir.startsWith(QLatin1String("http:/")))) {
QString songFile=currentSong.filePath(MPDConnection::self()->getDetails().dir);
if (!songFile.isEmpty()) {
static QMap<QString, MapEntry> tagMap;
static QMap<QString, MapEntry> tagTimeMap;
@@ -543,7 +535,7 @@ void SongView::loadMetadata()
tagTimeMap.insert(QLatin1String("TAGGING TIME"), MapEntry(pos++, tr("Tagging time")));
}
QMap<QString, QString> allTags=Tags::readAll(MPDConnection::self()->getDetails().dir+actualFile(currentSong));
QMap<QString, QString> allTags=Tags::readAll(songFile);
if (!allTags.isEmpty()) {
QMap<QString, QString>::ConstIterator it=allTags.constBegin();
@@ -633,12 +625,12 @@ void SongView::loadMetadata()
} else {
tagInfo+=QLatin1String("<tr/>");
}
if (MPDConnection::self()->getDetails().dirReadable) {
QString path=Utils::getDir(currentSong.filePath(MPDConnection::self()->getDetails().dir));
tagInfo+=createRow(tr("Filename"), QLatin1String("<a href=\"file://")+path+QLatin1String("\">")+
currentSong.filePath()+QLatin1String("</a>"));
QString songFile=currentSong.filePath(MPDConnection::self()->getDetails().dir);
if (QFile::exists(songFile)) {
tagInfo+=createRow(tr("Filename"), QLatin1String("<a href=\"file://")+songFile+QLatin1String("\">")+
songFile+QLatin1String("</a>"));
} else {
tagInfo+=createRow(tr("Filename"), currentSong.filePath());
tagInfo+=createRow(tr("Filename"), songFile);
}
tagInfo+=QLatin1String("</table>");

16
mpd-interface/song.cpp
View File

@@ -769,10 +769,18 @@ QString Song::basicArtist() const
QString Song::filePath(const QString &base) const
{
QString fileName=filePath();
bool haveAbsPath=fileName.startsWith("/"); // Utils::constDirSep
if (!haveAbsPath) {
return QString(base+fileName);
if (isCantataStream()) {
return QUrl(file).path();
}
if (isLocalFile()) {
return file;
}
QString fileName=decodePath(file, isCdda());
if (!base.isEmpty()) {
bool haveAbsPath=fileName.startsWith("/"); // Utils::constDirSep
if (!haveAbsPath) {
return QString(base+fileName);
}
}
return fileName;
}

3
mpd-interface/song.h
View File

@@ -223,8 +223,7 @@ struct Song
bool isCueFile() const { return Playlist==type && file.endsWith(QLatin1String(".cue"), Qt::CaseInsensitive); }
bool isFromCue() const { return CueFile::isCue(file); }
QString basicArtist() const;
QString filePath() const { return decodePath(file, isCdda()); }
QString filePath(const QString &base) const;
QString filePath(const QString &base=QString()) const;
QString displayAlbum(bool useComp=true) const { return displayAlbum(useComp ? albumName() : album, displayYear()); }
QString describe(bool withMarkup=false) const;
bool useComposer() const;