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

Fix narrowing conversions in discogs cover provider

Browse Source
This commit is contained in:
EmmanuelMess
2021-09-10 15:40:12 -03:00
parent fa3b9a2135
commit 14881ba6b2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/covermanager/discogscoverprovider.cpp
View File

@@ -229,7 +229,7 @@ QByteArray DiscogsCoverProvider::GetReplyData(QNetworkReply *reply) {
} }
void DiscogsCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { void DiscogsCoverProvider::HandleSearchReply(QNetworkReply *reply, const quint64 id) {
if (!replies_.contains(reply)) return; if (!replies_.contains(reply)) return;
replies_.removeAll(reply); replies_.removeAll(reply);
@@ -285,7 +285,7 @@ void DiscogsCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id)
Error("Invalid Json reply, results value object is missing ID, title or resource_url.", obj_result); Error("Invalid Json reply, results value object is missing ID, title or resource_url.", obj_result);
continue; continue;
} }
quint64 release_id = obj_result["id"].toDouble(); quint64 release_id = obj_result["id"].toInt();
QUrl resource_url(obj_result["resource_url"].toString()); QUrl resource_url(obj_result["resource_url"].toString());
QString title = obj_result["title"].toString(); QString title = obj_result["title"].toString();
@@ -336,7 +336,7 @@ void DiscogsCoverProvider::SendReleaseRequest(const DiscogsCoverReleaseContext &
} }
void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int search_id, const quint64 release_id) { void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const quint64 search_id, const quint64 release_id) {
if (!replies_.contains(reply)) return; if (!replies_.contains(reply)) return;
replies_.removeAll(reply); replies_.removeAll(reply);
@@ -440,7 +440,7 @@ void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int se
int width = obj_image["width"].toInt(); int width = obj_image["width"].toInt();
int height = obj_image["height"].toInt(); int height = obj_image["height"].toInt();
if (width < 300 || height < 300) continue; if (width < 300 || height < 300) continue;
const float aspect_score = float(1.0) - float(std::max(width, height) - std::min(width, height)) / std::max(height, width); const float aspect_score = float(1.0) - float(std::max(width, height) - std::min(width, height)) / float(std::max(height, width));
if (aspect_score < 0.85) continue; if (aspect_score < 0.85) continue;
CoverProviderSearchResult result; CoverProviderSearchResult result;
result.artist = artist; result.artist = artist;

4
src/covermanager/discogscoverprovider.h
View File

@@ -90,8 +90,8 @@ class DiscogsCoverProvider : public JsonCoverProvider {
private slots: private slots:
void FlushRequests(); void FlushRequests();
void HandleSearchReply(QNetworkReply *reply, const int id); void HandleSearchReply(QNetworkReply *reply, const quint64 id);
void HandleReleaseReply(QNetworkReply *reply, const int id, const quint64 release_id); void HandleReleaseReply(QNetworkReply *reply, const quint64 id, const quint64 release_id);
private: private:
static const char *kUrlSearch; static const char *kUrlSearch;