From 56c4619cfd74befefa9e9ab1064c40d2d8df72ed Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 4 Mar 2021 09:48:15 +0100 Subject: [PATCH] Add author etc to github scraper. --- resources/scripts/scrapers/github-releases.py | 16 +++++++++------- .../standard/gui/formstandardfeeddetails.cpp | 8 ++++++++ .../standard/gui/formstandardfeeddetails.h | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/resources/scripts/scrapers/github-releases.py b/resources/scripts/scrapers/github-releases.py index 1bc121005..247ffbb55 100755 --- a/resources/scripts/scrapers/github-releases.py +++ b/resources/scripts/scrapers/github-releases.py @@ -24,15 +24,17 @@ items = list() for rel in json_data: if rel['prerelease'] and leave_out_prereleases: - continue + continue - article_url = json.dumps(rel['url']) - article_title = json.dumps(rel['tag_name']) + article_author = json.dumps(rel["author"]["login"]) + article_url = json.dumps(rel["html_url"]) + article_title = json.dumps(rel["tag_name"]) article_time = json.dumps(datetime.strptime(rel["published_at"], "%Y-%m-%dT%H:%M:%SZ").isoformat()) - items.append("{{\"title\": {title}, \"content_html\": {html}, \"url\": {url}, \"date_published\": {date}}}".format(title=article_title, - html=article_title, - url=article_url, - date=article_time)) + items.append("{{\"title\": {title}, \"authors\": [{{\"name\": {author}}}], \"content_html\": {html}, \"url\": {url}, \"date_published\": {date}}}".format(title=article_title, + html=article_title, + url=article_url, + date=article_time, + author=article_author)) json_feed = json_feed.format(title = "Releases", items = ", ".join(items)) print(json_feed) \ No newline at end of file diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp index 5e4badd94..735cec10e 100644 --- a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp @@ -26,6 +26,10 @@ FormStandardFeedDetails::FormStandardFeedDetails(ServiceRoot* service_root, Root connect(m_standardFeedDetails->m_ui.m_btnFetchMetadata, &QPushButton::clicked, this, &FormStandardFeedDetails::guessFeed); connect(m_standardFeedDetails->m_actionFetchIcon, &QAction::triggered, this, &FormStandardFeedDetails::guessIconOnly); + connect(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit(), &QLineEdit::textChanged, + this, &FormStandardFeedDetails::onTitleChanged); + + onTitleChanged(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit()->text()); } void FormStandardFeedDetails::guessFeed() { @@ -44,6 +48,10 @@ void FormStandardFeedDetails::guessIconOnly() { m_authDetails->m_txtPassword->lineEdit()->text()); } +void FormStandardFeedDetails::onTitleChanged(const QString& title) { + m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(!title.simplified().isEmpty()); +} + void FormStandardFeedDetails::apply() { FormFeedDetails::apply(); diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.h b/src/librssguard/services/standard/gui/formstandardfeeddetails.h index a7390987d..0ecf92b7a 100644 --- a/src/librssguard/services/standard/gui/formstandardfeeddetails.h +++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.h @@ -19,6 +19,7 @@ class FormStandardFeedDetails : public FormFeedDetails { private slots: void guessFeed(); void guessIconOnly(); + void onTitleChanged(const QString& title); virtual void apply();