From d192784e1216149761348d5f13a80103a8949b88 Mon Sep 17 00:00:00 2001
From: Bart De Vries <bart@mogwai.be>
Date: Tue, 15 Nov 2022 19:13:24 +0100
Subject: [PATCH] Improve check for existing podcasts

The feedExists method will now also take query parameters into account.

BUG: 461877
---
 src/datamanager.cpp | 20 ++++++++++++++------
 src/datamanager.h   |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index ce38fe5d..c73c1c0e 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -584,13 +584,10 @@ void DataManager::loadEntry(const QString id) const
 
 bool DataManager::feedExists(const QString &url)
 {
-    // Try to account for some common cases where the URL is different but is
-    // actually pointing to the same data.  Currently covering:
-    // - http vs https
-    // - encoded vs non-encoded URLs
-    QString cleanUrl = QUrl(url).authority() + QUrl(url).path(QUrl::FullyDecoded);
+    // using cleanUrl to do "fuzzy" check on the podcast URL
+    QString cleanedUrl = cleanUrl(url);
     for (QString listUrl : m_feedmap) {
-        if (cleanUrl == (QUrl(listUrl).authority() + QUrl(listUrl).path(QUrl::FullyDecoded))) {
+        if (cleanedUrl == cleanUrl(listUrl)) {
             return true;
         }
     }
@@ -722,3 +719,14 @@ QStringList DataManager::getIdsFromModelIndexList(const QModelIndexList &list) c
     qCDebug(kastsDataManager) << "Ids of selection:" << ids;
     return ids;
 }
+
+QString DataManager::cleanUrl(const QString &url)
+{
+    // this is a method to create a "canonical" version of a podcast url which
+    // would account for some common cases where the URL is different but is
+    // actually pointing to the same data.  Currently covering:
+    // - http vs https (scheme is actually removed altogether!)
+    // - encoded vs non-encoded URLs
+    return QUrl(url).authority() + QUrl(url).path(QUrl::FullyDecoded)
+        + (QUrl(url).hasQuery() ? QStringLiteral("?") + QUrl(url).query(QUrl::FullyDecoded) : QStringLiteral(""));
+}
diff --git a/src/datamanager.h b/src/datamanager.h
index b37d41b3..9fd2ffac 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -102,6 +102,8 @@ private:
     void loadEntry(QString id) const;
     void updateQueueListnrs() const;
 
+    QString cleanUrl(const QString &url);
+
     QStringList getIdsFromModelIndexList(const QModelIndexList &list) const;
 
     mutable QHash<QString, Feed *> m_feeds; // hash of pointers to all feeds in db, key = url (lazy loading)