From 9fa4297158202de769037d71057b51d4b64aee21f95ff676d77be875033345c8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 22 Dec 2020 23:11:48 +0000 Subject: [PATCH 1/2] - Update to 3.26.0: - Clear user_agent for literotica.com - Fix finding imgs in existing epubs. Closes #608 Many thanks to Epicpkmn11 for finding this before I released. - Fixes for adapter_fictionlive, thanks HazelSh - Make default CSS for fiction.live and royalroad.com use em instead of pt, thanks HazelSh - Fix for genre change in adapter_royalroadcom - Fix for adapter_storiesonlinenet 'access' issue. - Don't error on w/o class in replace_failed_smilies_with_alt_text - Allow tab to leave edit boxes. - Revert(ish) 'fix' for ffnet covers--they fixed it. - Change convert_inline_images default to false. - Fix http/https matching in identifiers:url search. - Allow tags without src attr in epub to update - Fix for ffnet cover images changed? Or broken? - Warn, not crash on when cover_min_size fails. - Add 2nd dup-story URL check after fetching metadata for when story URL changes. - Fix adapter_thesietchcom for site change - Add (optional, default on) convert support for data:image in-line s. - Adding pass-through support for data:image in-line s. - XenForo: Fixes for extra /s in normalized URLs. - Set default cover_min_size: 10,10 to avoid spacer images as covers. - New Site: squidgeworld.org - shares code with AO3. - adapter_wuxiaworldco: added status #592 from Rikkitp - Don't use polyglot, not included until Calibre3. Remove some debug output. - adapter_scribblehubcom: Accept chapter URLs. - adapter_wwwnovelallcom: Accept chapter URLs, must change to true OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fanficfare?expand=0&rev=58 --- FanFicFare-3.25.0.tar.gz | 3 --- FanFicFare-3.26.0.tar.gz | 3 +++ python-fanficfare.changes | 42 +++++++++++++++++++++++++++++++++++++++ python-fanficfare.spec | 2 +- 4 files changed, 46 insertions(+), 4 deletions(-) delete mode 100644 FanFicFare-3.25.0.tar.gz create mode 100644 FanFicFare-3.26.0.tar.gz diff --git a/FanFicFare-3.25.0.tar.gz b/FanFicFare-3.25.0.tar.gz deleted file mode 100644 index baaf2cb..0000000 --- a/FanFicFare-3.25.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69ded9ff634ec538242577a5c3a7a2eff44102c8a3179e1f186243930b84ca5a -size 1303343 diff --git a/FanFicFare-3.26.0.tar.gz b/FanFicFare-3.26.0.tar.gz new file mode 100644 index 0000000..bf3b3b6 --- /dev/null +++ b/FanFicFare-3.26.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484cf85b6066ebf3929c67e91e0a333b9872ac2dd6723c1981b00aa3b8e5ccbe +size 1308219 diff --git a/python-fanficfare.changes b/python-fanficfare.changes index 3c95ecc..157c6cd 100644 --- a/python-fanficfare.changes +++ b/python-fanficfare.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Dec 22 23:09:58 UTC 2020 - Matej Cepl + +- Update to 3.26.0: + - Clear user_agent for literotica.com + - Fix finding imgs in existing epubs. Closes #608 Many thanks to + Epicpkmn11 for finding this before I released. + - Fixes for adapter_fictionlive, thanks HazelSh + - Make default CSS for fiction.live and royalroad.com use em instead + of pt, thanks HazelSh + - Fix for genre change in adapter_royalroadcom + - Fix for adapter_storiesonlinenet 'access' issue. + - Don't error on w/o class in replace_failed_smilies_with_alt_text + - Allow tab to leave edit boxes. + - Revert(ish) 'fix' for ffnet covers--they fixed it. + - Change convert_inline_images default to false. + - Fix http/https matching in identifiers:url search. + - Allow tags without src attr in epub to update + - Fix for ffnet cover images changed? Or broken? + - Warn, not crash on when cover_min_size fails. + - Add 2nd dup-story URL check after fetching metadata for when story + URL changes. + - Fix adapter_thesietchcom for site change + - Add (optional, default on) convert support for data:image in-line s. + - Adding pass-through support for data:image in-line s. + - XenForo: Fixes for extra /s in normalized URLs. + - Set default cover_min_size: 10,10 to avoid spacer images as covers. + - New Site: squidgeworld.org - shares code with AO3. + - adapter_wuxiaworldco: added status #592 from Rikkitp + - Don't use polyglot, not included until Calibre3. Remove some debug + output. + - adapter_scribblehubcom: Accept chapter URLs. + - adapter_wwwnovelallcom: Accept chapter URLs, must change to true + storyId/URL after. + - Make adapter_novelupdatescc share code with adapter_wuxiaworldco + - adapter_literotica: Keep language domains & use for language + metadata. #588 + - adapter_alternatehistorycom now uses same thread group HTML as + XenForo2. Closes #590 + - adapter_wuxiaworldco/adapter_novelupdatescc: Re-add Don't include + grayed out 'In preparation' chapters + ------------------------------------------------------------------- Mon Nov 9 20:00:20 UTC 2020 - Matej Cepl diff --git a/python-fanficfare.spec b/python-fanficfare.spec index 9e8e7ae..4cdffd6 100644 --- a/python-fanficfare.spec +++ b/python-fanficfare.spec @@ -21,7 +21,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-fanficfare -Version: 3.25.0 +Version: 3.26.0 Release: 0 Summary: Tool for making eBooks from stories on fanfiction and other web sites License: GPL-3.0-only From 081fb57bbffbc2da700b0c590062b922bdd6d2d37850e794588a1ba61147d4f7 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 24 Dec 2020 16:19:27 +0000 Subject: [PATCH 2/2] - Add use_cloudscraper code to use with CloudFlare sites, like fanfiction.net now does. - Changes to allow email chapter update URLs to work in adapter_wattpadcom - Updates for many included dependencies OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fanficfare?expand=0&rev=59 --- FanFicFare-3.26.0.tar.gz | 3 --- FanFicFare-3.27.0.tar.gz | 3 +++ _service | 4 ++-- _servicedata | 2 +- python-fanficfare.changes | 9 +++++++++ python-fanficfare.spec | 10 +++++++--- 6 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 FanFicFare-3.26.0.tar.gz create mode 100644 FanFicFare-3.27.0.tar.gz diff --git a/FanFicFare-3.26.0.tar.gz b/FanFicFare-3.26.0.tar.gz deleted file mode 100644 index bf3b3b6..0000000 --- a/FanFicFare-3.26.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:484cf85b6066ebf3929c67e91e0a333b9872ac2dd6723c1981b00aa3b8e5ccbe -size 1308219 diff --git a/FanFicFare-3.27.0.tar.gz b/FanFicFare-3.27.0.tar.gz new file mode 100644 index 0000000..ef5f7db --- /dev/null +++ b/FanFicFare-3.27.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea3754fb2db5c19daf7cd6356f5b76136717717517cedb943bb08ef8ba6b8e5 +size 1826033 diff --git a/_service b/_service index 220f1bc..ed80b26 100644 --- a/_service +++ b/_service @@ -1,13 +1,13 @@ - 3.18.1+git + 3.26.0+git https://github.com/JimmXinu/FanFicFare.git git enable *.tar - xz + gz diff --git a/_servicedata b/_servicedata index c6fedb8..b504334 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/JimmXinu/FanFicFare.git - 54f843ec061d1760b994f081936384ccd84b9162 \ No newline at end of file + fd11526da8a48d488df0ba019967ea41856a2f4c \ No newline at end of file diff --git a/python-fanficfare.changes b/python-fanficfare.changes index 157c6cd..41ac6a8 100644 --- a/python-fanficfare.changes +++ b/python-fanficfare.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 24 16:17:00 UTC 2020 - Matej Cepl + +- Add use_cloudscraper code to use with CloudFlare sites, like + fanfiction.net now does. +- Changes to allow email chapter update URLs to work in + adapter_wattpadcom +- Updates for many included dependencies + ------------------------------------------------------------------- Tue Dec 22 23:09:58 UTC 2020 - Matej Cepl diff --git a/python-fanficfare.spec b/python-fanficfare.spec index 4cdffd6..53b9d41 100644 --- a/python-fanficfare.spec +++ b/python-fanficfare.spec @@ -21,14 +21,14 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-fanficfare -Version: 3.26.0 +Version: 3.27.0 Release: 0 Summary: Tool for making eBooks from stories on fanfiction and other web sites License: GPL-3.0-only Group: Development/Languages/Python URL: https://github.com/JimmXinu/FanFicFare Source: https://github.com/JimmXinu/%{modname}/archive/v%{version}/%{modname}-%{version}.tar.gz -# Source: %%{modname}-%%{version}.tar.xz +# Source: %%{modname}-%%{version}.tar.gz BuildRequires: %{python_module beautifulsoup4} BuildRequires: %{python_module chardet} BuildRequires: %{python_module html2text} @@ -39,6 +39,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-beautifulsoup4 Requires: python-chardet +Requires: python-cloudscraper Requires: python-html2text Requires: python-html5lib Requires: python-setuptools @@ -59,7 +60,10 @@ Main Features of FanFicFare: - Ability to update already downloaded book %prep -%setup -q -n %{modname}-%{version} +%autosetup -p1 -n %{modname}-%{version} + +rm -rf included_dependencies/ + sed -i -e '/^#!\/usr\/bin\/python/d' fanficfare/mobi{,html}.py dos2unix DESCRIPTION.rst README.md