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

Hopefully this finishes the path part of playlist preferences.

Browse Source
This commit is contained in:
Gavin Howard 2014-08-12 21:29:29 -06:00
parent e8d3aa9254
commit 0efb23994d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/playlistparsers/parserbase.cpp
View File

@ -20,11 +20,12 @@
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "library/libraryquery.h" #include "library/libraryquery.h"
#include "library/sqlrow.h" #include "library/sqlrow.h"
#include "playlist/playlist.h"
#include <QUrl> #include <QUrl>
ParserBase::ParserBase(LibraryBackendInterface* library, QObject* parent) ParserBase::ParserBase(LibraryBackendInterface* library, QSettings *settings, QObject* parent)
: QObject(parent), library_(library) {} : QObject(parent), settings_(settings), library_(library) {}
void ParserBase::LoadSong(const QString& filename_or_url, qint64 beginning, void ParserBase::LoadSong(const QString& filename_or_url, qint64 beginning,
const QDir& dir, Song* song) const { const QDir& dir, Song* song) const {
@ -90,10 +91,13 @@ QString ParserBase::URLOrRelativeFilename(const QUrl& url,
if (url.scheme() != "file") return url.toString(); if (url.scheme() != "file") return url.toString();
const QString filename = url.toLocalFile(); const QString filename = url.toLocalFile();
if (QDir::isAbsolutePath(filename)) { const Playlist::Path path = settings->value("path_type", Playlist::Path_Automatic);
if (path != Playlist::Path_Absolute && QDir::isAbsolutePath(filename)) {
const QString relative = dir.relativeFilePath(filename); const QString relative = dir.relativeFilePath(filename);
if (!relative.startsWith("../")) return relative; if (!relative.startsWith("../") || path == Playlist::Path_Relative)
return relative;
} }
return filename; return filename;
} }

4
src/playlistparsers/parserbase.h
View File

@ -22,6 +22,7 @@
#include <QDir> #include <QDir>
#include "core/song.h" #include "core/song.h"
#include "playlist/playlist.h"
class LibraryBackendInterface; class LibraryBackendInterface;
@ -29,7 +30,7 @@ class ParserBase : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ParserBase(LibraryBackendInterface* library, QObject* parent = nullptr); ParserBase(LibraryBackendInterface* library, QSettings* settings, QObject* parent = nullptr);
virtual QString name() const = 0; virtual QString name() const = 0;
virtual QStringList file_extensions() const = 0; virtual QStringList file_extensions() const = 0;
@ -72,6 +73,7 @@ class ParserBase : public QObject {
private: private:
LibraryBackendInterface* library_; LibraryBackendInterface* library_;
QSettings* settings_;
}; };
#endif // PARSERBASE_H #endif // PARSERBASE_H