From 7e0ae5f49a610d6eaf559ecc7bcc225a1cc59603 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 3 Jun 2021 13:21:07 +0200 Subject: [PATCH] extra encoding support --- resources/scripts/scrapers/translate-rss2.py | 9 +++++++-- src/librssguard/services/standard/standardfeed.cpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/scripts/scrapers/translate-rss2.py b/resources/scripts/scrapers/translate-rss2.py index 9e616da75..329cb2e1b 100755 --- a/resources/scripts/scrapers/translate-rss2.py +++ b/resources/scripts/scrapers/translate-rss2.py @@ -24,11 +24,16 @@ lang_from = sys.argv[1] lang_to = sys.argv[2] parallel = bool(distutils.util.strtobool(sys.argv[3])) +if (len(sys.argv) >= 5): + src_enc = sys.argv[4] +else: + src_enc = "utf-8" + if parallel: import asyncio from concurrent.futures import ThreadPoolExecutor -sys.stdin.reconfigure(encoding='utf-8') +sys.stdin.reconfigure(encoding = src_enc) rss_data = sys.stdin.read() rss_document = ET.fromstring(rss_data) translator = Translator() @@ -57,7 +62,7 @@ title.text = translate_string(title.text) # Translate articles. if parallel: - with ThreadPoolExecutor(max_workers = 8) as executor: + with ThreadPoolExecutor(max_workers = 2) as executor: futures = [] for article in rss_document.findall(".//item"): futures.append(executor.submit(process_article, article)) diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp index 816214101..631fc3258 100644 --- a/src/librssguard/services/standard/standardfeed.cpp +++ b/src/librssguard/services/standard/standardfeed.cpp @@ -562,7 +562,7 @@ QString StandardFeed::runScriptProcess(const QStringList& cmd_args, const QStrin return raw_output; } else { - process.kill(); + //process.kill(); auto raw_error = process.readAllStandardError().simplified();