dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QUrl::isLocalFile()

Browse Source
This commit is contained in:
Jonas Kvinge
2019-07-09 21:43:56 +02:00
parent f4b1ef4d04
commit 7fa1461d5e
13 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/song.cpp
View File

@@ -328,9 +328,9 @@ int Song::lastplayed() const { return d->lastplayed_; }
const QUrl &Song::art_automatic() const { return d->art_automatic_; }
const QUrl &Song::art_manual() const { return d->art_manual_; }
bool Song::has_manually_unset_cover() const { return d->art_manual_.path() == kManuallyUnsetCover; }
void Song::manually_unset_cover() { d->art_manual_.clear(); d->art_manual_.setPath(kManuallyUnsetCover); }
void Song::manually_unset_cover() { d->art_manual_ = QUrl::fromLocalFile(kManuallyUnsetCover); }
bool Song::has_embedded_cover() const { return d->art_automatic_.path() == kEmbeddedCover; }
void Song::set_embedded_cover() { d->art_automatic_.clear(); d->art_automatic_.setPath(kEmbeddedCover); }
void Song::set_embedded_cover() { d->art_automatic_ = QUrl::fromLocalFile(kEmbeddedCover); }
const QImage &Song::image() const { return d->image_; }
const QString &Song::cue_path() const { return d->cue_path_; }
@@ -447,7 +447,7 @@ QString Song::JoinSpec(const QString &table) {
Song::Source Song::SourceFromURL(const QUrl &url) {
if (url.scheme() == "file") return Source_LocalFile;
if (url.isLocalFile()) return Source_LocalFile;
else if (url.scheme() == "cdda") return Source_CDDA;
else if (url.scheme() == "tidal") return Source_Tidal;
else if (url.scheme() == "subsonic") return Source_Subsonic;
@@ -697,7 +697,7 @@ void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
}
if (pb.has_art_automatic()) {
set_art_automatic(QUrl::fromEncoded(QByteArray(pb.art_automatic().data(), pb.art_automatic().size())));
set_art_automatic(QUrl::fromLocalFile(QByteArray(pb.art_automatic().data(), pb.art_automatic().size())));
}
InitArtManual();
@@ -1407,4 +1407,3 @@ void Song::MergeUserSetData(const Song &other) {
set_art_manual(other.art_manual());
}

2
src/core/songloader.cpp
View File

@@ -118,7 +118,7 @@ SongLoader::Result SongLoader::Load(const QUrl &url) {
url_ = url;
if (url_.scheme() == "file") {
if (url_.isLocalFile()) {
return LoadLocal(url_.toLocalFile());
}

4
src/core/utilities.cpp
View File

@@ -379,7 +379,7 @@ void OpenInFileBrowser(const QList<QUrl> &urls) {
QSet<QString> dirs;
for (const QUrl &url : urls) {
if (url.scheme() != "file") {
if (!url.isLocalFile()) {
continue;
}
QString path = url.toLocalFile();
@@ -662,7 +662,7 @@ bool IsLaptop() {
bool UrlOnSameDriveAsStrawberry(const QUrl &url) {
if (!url.isValid() || url.scheme() != "file" || url.toLocalFile().isEmpty()) return false;
if (!url.isValid() || !url.isLocalFile() || url.toLocalFile().isEmpty()) return false;
#ifdef Q_OS_WIN
QUrl appUrl = QUrl::fromLocalFile(QCoreApplication::applicationDirPath());