From e83235395ad90c9c7963a8b489207e0d7ed12046 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 11 Nov 2024 11:31:11 +0100 Subject: [PATCH] aktualizace hudebnibazar --- resources/scripts/scrapers/hudebnibazar.py | 10 +++++++--- src/librssguard/miscellaneous/feedreader.cpp | 9 --------- src/librssguard/miscellaneous/feedreader.h | 2 -- src/rssguard/main.cpp | 1 - 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/resources/scripts/scrapers/hudebnibazar.py b/resources/scripts/scrapers/hudebnibazar.py index 70b4cec4b..7e01f1511 100644 --- a/resources/scripts/scrapers/hudebnibazar.py +++ b/resources/scripts/scrapers/hudebnibazar.py @@ -22,7 +22,7 @@ number_of_pages = int(sys.argv[2]) url_base = "https://hudebnibazar.cz" url = "{}/{}/?is=1&f=&n=vse&r=&i=50&o=datum&ign=on".format(url_base, category) -json_feed = '{{"title": "HudebniBazar - {cat}", "items": [{items}]}}' +json_feed = '{{"title": "HudebniBazar - {cat}", "version": "https://jsonfeed.org/version/1.1", "items": [{items}]}}' items = list() # To avoid TLSv1.2 errors. @@ -50,7 +50,7 @@ def processListingDate(string_date: str): # hour=int(yday.group(1)), minute=int(yday.group(2)) # ) - dy = dateparser.parse(string_date, languages=["cs"]).replace(second=0, microsecond=0) + dy = dateparser.parse(string_date, languages=["cs"]).replace(microsecond=0) local = pytz.timezone("Europe/Prague") return local.localize(dy).astimezone(pytz.utc) @@ -70,7 +70,11 @@ def processListingImgs(listing: bs4.Tag): def generateListingJson(listing: bs4.Tag): - article_price = listing.find(class_="InzeratCena").contents[0].get_text(strip=True) + try: + article_price = listing.find(class_="InzeratCena").contents[0].get_text(strip=True) + except: + article_price = "dohoda" + article_title = listing.find(class_="InzeratNadpis").b.get_text(strip=True) article_date = listing.find(class_="InzeratZarazeno").get_text(strip=True) diff --git a/src/librssguard/miscellaneous/feedreader.cpp b/src/librssguard/miscellaneous/feedreader.cpp index 611408f39..7c61a48aa 100644 --- a/src/librssguard/miscellaneous/feedreader.cpp +++ b/src/librssguard/miscellaneous/feedreader.cpp @@ -273,15 +273,6 @@ void FeedReader::pauseUnpaseFeedFetching(bool pause) { qApp->settings()->setValue(GROUP(Feeds), Feeds::PauseFeedFetching, pause); } -void FeedReader::warnAboutPausedFetching() const { - if (m_feedFetchingPaused) { - qApp->showGuiMessage(Notification::Event::GeneralEvent, - GuiMessage(tr("Feed fetching is paused"), - tr("Automatic feed fetching based on time interval is currently paused."), - QSystemTrayIcon::MessageIcon::Warning)); - } -} - bool FeedReader::isFeedUpdateRunning() const { return m_feedDownloader != nullptr && m_feedDownloader->isUpdateRunning(); } diff --git a/src/librssguard/miscellaneous/feedreader.h b/src/librssguard/miscellaneous/feedreader.h index bb38afbd4..4193968f0 100644 --- a/src/librssguard/miscellaneous/feedreader.h +++ b/src/librssguard/miscellaneous/feedreader.h @@ -35,8 +35,6 @@ class RSSGUARD_DLLSPEC FeedReader : public QObject { FeedsProxyModel* feedsProxyModel() const; MessagesProxyModel* messagesProxyModel() const; - void warnAboutPausedFetching() const; - // Update feeds in extra thread. void updateFeeds(const QList& feeds, bool update_switched_off_too = false); diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 5d92d9071..2331516ef 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -127,7 +127,6 @@ int main(int argc, char* argv[]) { qApp->loadDynamicShortcuts(); qApp->hideOrShowMainForm(); - qApp->feedReader()->warnAboutPausedFetching(); qApp->feedReader()->loadSavedMessageFilters(); qApp->feedReader()->feedsModel()->loadActivatedServiceAccounts(); qApp->showTrayIcon();