fix "avoid load old news" logic

ChiaYen-Kan · Feb 16, 2024 · 1dde8bc · 1dde8bc
1 parent 58292be
commit 1dde8bc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/addfeedwizard.cpp b/src/addfeedwizard.cpp
@@ -372,16 +372,13 @@ void AddFeedWizard::addFeed()
     }
 
     // Insert feed
-    q.prepare("INSERT INTO feeds(xmlUrl, created, rowToParent, authentication, addSingleNewsAnyDateOn, avoidedOldSingleNewsDateOn, avoidedOldSingleNewsDate) "
-              "VALUES (:feedUrl, :feedCreateTime, :rowToParent, :authentication, :addSingleNewsAnyDateOn, :avoidedOldSingleNewsDateOn, :avoidedOldSingleNewsDate)");
+    q.prepare("INSERT INTO feeds(xmlUrl, created, rowToParent, authentication) "
+              "VALUES (:feedUrl, :feedCreateTime, :rowToParent, :authentication)");
     q.bindValue(":feedUrl", feedUrlString_);
     q.bindValue(":feedCreateTime",
         QLocale::c().toString(QDateTime::currentDateTimeUtc(), "yyyy-MM-ddTHH:mm:ss"));
     q.bindValue(":rowToParent", rowToParent);
     q.bindValue(":authentication", auth);
-    q.bindValue(":addSingleNewsAnyDateOn", mainApp->mainWindow()->avoidOldNews_ ? "0":"1");
-    q.bindValue(":avoidedOldSingleNewsDateOn", mainApp->mainWindow()->avoidOldNews_ ? "1":"0");
-    q.bindValue(":avoidedOldSingleNewsDate", mainApp->mainWindow()->avoidedOldNewsDate_);
     q.exec();
 
     feedId_ = q.lastInsertId().toInt();

diff --git a/src/parseobject.cpp b/src/parseobject.cpp
@@ -130,6 +130,16 @@ void ParseObject::slotParse(const QByteArray &xmlData, const int &feedId,
     avoidedOldSingleNewsDate_ = q.value(4).toDate();
   }
 
+  if (avoidedOldSingleNews_ == false)
+  {
+    if (mainApp->mainWindow()->avoidOldNews_ == true)
+    {
+      addSingleNewsAnyDate_ = !mainApp->mainWindow()->avoidOldNews_;
+      avoidedOldSingleNews_ = mainApp->mainWindow()->avoidOldNews_;
+      avoidedOldSingleNewsDate_ = mainApp->mainWindow()->avoidedOldNewsDate_;
+    }
+  }
+
   // id not found (ex. feed deleted while updating)
   if (feedUrl.isEmpty()) {
     qWarning() << QString("Feed with id = '%1' not found").arg(parseFeedId_);

diff --git a/src/updatefeeds.cpp b/src/updatefeeds.cpp
@@ -463,8 +463,8 @@ void UpdateObject::slotImportFeeds(QByteArray xmlData)
                    arg(parentIdsStack.top()));
             if (q.next()) rowToParent = q.value(0).toInt();
 
-            q.prepare("INSERT INTO feeds(text, title, description, xmlUrl, htmlUrl, created, parentId, rowToParent, addSingleNewsAnyDateOn, avoidedOldSingleNewsDateOn, avoidedOldSingleNewsDate) "
-                      "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            q.prepare("INSERT INTO feeds(text, title, description, xmlUrl, htmlUrl, created, parentId, rowToParent) "
+                      "VALUES(?, ?, ?, ?, ?, ?, ?, ?)");
             q.addBindValue(textString);
             q.addBindValue(xml.attributes().value("title").toString());
             q.addBindValue(xml.attributes().value("description").toString());
@@ -473,9 +473,6 @@ void UpdateObject::slotImportFeeds(QByteArray xmlData)
             q.addBindValue(QDateTime::currentDateTimeUtc().toString(Qt::ISODate));
             q.addBindValue(parentIdsStack.top());
             q.addBindValue(rowToParent);
-            q.addBindValue(mainApp->mainWindow()->avoidOldNews_ ? 0 : 1);
-            q.addBindValue(mainApp->mainWindow()->avoidOldNews_ ? 1 : 0);
-            q.addBindValue(mainApp->mainWindow()->avoidedOldNewsDate_);
             q.exec();
 
             idsList.append(q.lastInsertId().toInt());