[arch-commits] Commit in fanficfare/trunk (3 files)

Mon May 3 10:44:31 UTC 2021

Date: Monday, May 3, 2021 @ 10:44:30
  Author: eschwartz
Revision: 926867

upgpkg: fanficfare 4.2.0-1: upstream release

Include the glue for fanficfare to run as a calibre plugin, now that:
- calibre supports a system plugin directory
- fanficfare plugin's import mechanism handles importing the fanficfare
  module from site-packages

Added:
  fanficfare/trunk/0001-makeplugin-do-not-bundle-system-dependencies.patch
Modified:
  fanficfare/trunk/PKGBUILD
  fanficfare/trunk/changelog.txt

---------------------------------------------------------+
 0001-makeplugin-do-not-bundle-system-dependencies.patch |   37 ++++
 PKGBUILD                                                |   26 ++-
 changelog.txt                                           |  120 ++++++--------
 3 files changed, 113 insertions(+), 70 deletions(-)

Added: 0001-makeplugin-do-not-bundle-system-dependencies.patch
===================================================================

--- 0001-makeplugin-do-not-bundle-system-dependencies.patch	                        (rev 0)
+++ 0001-makeplugin-do-not-bundle-system-dependencies.patch	2021-05-03 10:44:30 UTC (rev 926867)
@@ -0,0 +1,37 @@
+From a483e39777470538e2e94cb5048b3dc370a35e83 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Sun, 18 Apr 2021 15:35:15 -0400
+Subject: [PATCH] makeplugin: do not bundle system dependencies
+
+---
+ makeplugin.py | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/makeplugin.py b/makeplugin.py
+index 6ee101fb..e6f7c20c 100644
+--- a/makeplugin.py
++++ b/makeplugin.py
+@@ -34,19 +34,9 @@ if __name__=="__main__":
+                   files,
+                   exclude=exclude)
+ 
+-    os.chdir('../included_dependencies')
+-    files=['bs4','chardet','html2text','soupsieve','backports',
+-           'cloudscraper','requests','requests_toolbelt',
+-           'requests_file.py','urllib3','certifi','idna','brotlidecpy']
+-    ## Kept only for v2.85.1 support now.
+-    createZipFile("../"+filename,"a",
+-                  files,
+-                  exclude=exclude)
+-
+     os.chdir('..')
+     # 'a' for append
+     files=['fanficfare']
+     createZipFile(filename,"a",
+                   files,
+-                  exclude=exclude)
+-
++                  exclude=exclude + ['*.py'])
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-03 10:09:05 UTC (rev 926866)
+++ PKGBUILD	2021-05-03 10:44:30 UTC (rev 926867)
@@ -2,7 +2,7 @@
 
 _pkgname=FanFicFare
 pkgname=fanficfare
-pkgver=4.1.0
+pkgver=4.2.0
 pkgrel=1
 pkgdesc="A tool for downloading fanfiction to eBook formats"
 arch=('any')
@@ -12,15 +12,30 @@
 _deps=('beautifulsoup4' 'brotli' 'chardet' 'cloudscraper' 'html5lib' 'html2text'
        'requests-file')
 depends=("${_deps[@]/#/python-}")
-optdepends=('python-pillow: support for converting/resizing story images and covers')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('18cc709ed903f8c01507a5da4acdea1a862efaf67cd6b2f8e00d03d36483398a')
-b2sums=('3b9c5ea7511f6d52b9a364e541de6cc0975264926697c35c45ee26cc04c0cd61c986e0b47de4a2d944b11abff6148802b8695000369d1a780f6e3f346ee2b96e')
+optdepends=('calibre: use FanFicFare as a calibre plugin'
+            'python-pillow: support for converting/resizing story images and covers')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        "0001-makeplugin-do-not-bundle-system-dependencies.patch")
+sha256sums=('66f3fabcf0d9333638ec0ef3c4a86538ebd3f77692448374c0de1cea9e489107'
+            '6d172dcc98a8f6dcef2048272bfabd810ceeb5740969fbe406ebcd7b638e072c')
+b2sums=('ead76ac461de4ba5c6e09cbeb278fecc06d605d5900efc069b6f7d7a21aef3af700bd59af41d9b9680a8e0dccf4535f12482488dc63a9c594b3f636bd9800b19'
+        'eca0e505305ef74e0af1be6f5c1376091da4cd69bfc9f468f6040cf35d71890e3901b9cf0a9f9e25e6cb409651d402d8414116d0a8d43269bfdab2fdd0005279')
 
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    patch -p1 -i ../0001-makeplugin-do-not-bundle-system-dependencies.patch
+}
+
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
     python setup.py build
+
+    for i in calibre-plugin/translations/*.po; do
+        msgfmt -vv "$i" -o "${i%.po}.mo"
+    done
+    python makeplugin.py
 }
 
 package() {
@@ -27,4 +42,5 @@
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm644 FanFicFare.zip "${pkgdir}"/usr/share/calibre/system-plugins/FanFicFare.zip
 }

Modified: changelog.txt
===================================================================
--- changelog.txt	2021-05-03 10:09:05 UTC (rev 926866)
+++ changelog.txt	2021-05-03 10:44:30 UTC (rev 926867)
@@ -1,70 +1,60 @@
+Version 4.2.0 - 30 Apr 2021
+- Add New Site: novelfull.com (#688 & #689) - Thanks, AlexRiina!
+- Need to set logger.setLevel() again with import changes to see debugs in
+  plugin.
+- import changes for arch linux system plugins - As submitted by eli-schwartz
+- Remove site: fictionpad.com, completely different site, looks like generic
+  parked?
+- Remove site: www.thundercatsfans.org, no longer efiction, now static pages
+  and PDFs
+- Remove site: www.thepetulantpoetess.com, no longer efiction, URLs like OTW
+  but different
+- Remove site: www.potterfics.com, "Potterfics.com has closed its doors
+  forever"
+- Remove site: fanfic.castletv.net, DNS there, no server, last successful
+  2018-10-21
+- Remove site: deandamage.com, site there, efiction broken, last successful
+  2018-12-04
+- Remove site: www.deepinmysoul.net, moved to deepinmysoul.nl and changed
+  software--not eFiction anymore, <100 stories, all old
+- Include code for nsapa_proxy for dealing with Captchas (by nsapa -- coming
+  soon!)
+- Some other import cleanup.
+- Updates from cloudscraper 1.2.58
+- Use newer Calibre image processing, add JPG quality setting - thanks, Malloc
+  Voidstar
+- Add use_cloudscraper:true under [www.ficbook.net] to defaults.ini
+- Fix for adapter_literotica story URL oddities. Again.
+- Fix for site change: adapter_fictionmaniatv
+- Get storyId for sugarquillnet and siyecouk from the parsed query string.
+  From mcepl
+- Fix for adapter_literotica changing URLs on author page yet again.
+- Add [harrypotterfanfiction.com] slow_down_sleep_time:1 -- Site blocking fast
+  downloads.
+
+Version 4.1.0 - 26 Mar 2021
+- adapter_literotica - Update for recent site change and fix first chapter -
+  Thanks, davidfor!
+- adapter_fictionlive - Fix off-by-one error in most_recent_chunk /
+  add_chapter_url interaction, closes #672 Thanks, HazelSh!
+- Fixes for literotica sites changes. Issue #671
+- Fix for include_dice_rolls when multiple fieldsets.
+- Check for img 'failedtoload' *before* trying to fetch on updates.
+- Issue with fiction.live setting in defaults[fiction.live] overriding
+  personal[www.fiction.live]. Could use a more general solution if I can think
+  of one.
+- minor changes to track fictionlive website updates - Thanks, HazelSh #668
+- Fix show_timestamps option in adapter_fictionlive
+- Add include_dice_rolls option
+- Include error for continue_on_chapter_error in log
+- Put 'Change theme to Classic' back in adapter_storiesonlinenet
+- Remove some dup imports/code, thanks akshgpt7. Closes #663
+- use_ssl_unverified_context:true ignored when use_clouadscraper:true
+- Fixes for ancient 'import *' getting broken by removing unused imports in
+  base_writer -- Fixes "name 're' is not defined" with HTML output.
+
 Version 4.0.2 - 21 Feb 2021
 - Fix for BG job race conditions.
 - Fix writer_txt import removeAllEntities
 - Update plugin about.html
 - Fix reduce_zalgo not imported.
-
-Version 4.0.0 - 18 Feb 2021
-- Major refactoring/rewrite of network fetching and caching layer using
-  `requests` library.
-- use_browser_cache feature added -- Read fanfiction.net stories from your
-  Chrome or FireFox browser cache in addition / instead of the network. Many
-  thanks to Sidney Markowitz for the stellar help with this. See
-  BrowserCacheFeature Wiki Page.
-- Add additional_images setting for html & epub formats. Close #648
-- Fix for 'Updating' (anonymous?) author in adapter_wuxiaworldsite. For #657
-- Allow tweak_fg_sleep etc with any site, add defaults settings for
-  basexenforo, fictionalley and fictionpress.
-- Drag/drop of 'emails'--look for story URL in Content-Base header for
-  Thunderbird RSS 'emails'.
-- Apply 'email' proc flag when processing dragged .eml files--which are
-  emails.
-- Update translations.
-- Fix adapter_webnovelcom for some site changes. Closes #644
-- Allow tweak_fg_sleep etc with any site, add defaults settings for
-  basexenforo, fictionalley and fictionpress.
-- fanficauthors.net doesn't use login anymore. Closes #651
-- BG % done by stories AND chapters.
-- Restore multi-process background jobs as one process per site.
-- Don't count continue_on_chapter_error chapters when checking vs 'new
-  chapters'.
-- More properly get msg payload fromemail drag and drop. Closes #645
-- Give adapter_archiveofourownorg a get_section_url() for quicker rejects
-  checks from email.
-- Convert adapter_spikeluvercom to base_efiction after site changes.
-- Remove 'extrasleep' feature--it was ugly--increase slow_down_sleep_time for
-  the couple sites that used it. We can trust the users, right?
-- Remove httplib._MAXHEADERS workaround for royalroad.com - not happening
-  anymore.
-- Fixes for py2/py3 & a stray INI space.
-- Fix for Reject List to equate story URLs with and without titles, for
-  XenForo and ffnet. Otherwise you can end up with dups in Reject List and not
-  recognize new URLs are already being rejected. Also fixes [storyUrl]
-  sections without titles for ffnet.
-- Fix fictionpress.net and retain Reject List entries for removed sites.
-- Get cloudscraper 1.2.56 changes, but keep py2 compat.
-- Fix for chapter error report. Closes #641
-- adapter_fanfictionnet: Start keeping story title part of storyUrl.
-
-Version 3.29.0 - 20 Jan 2021
-- Re-enable adapter_fanfictionnet and bump up sleep times for same.
-- Update translations.
-- Add better chapter error reporting, refactor proceed_question code.
-- Add plugin options to mark success/failed/chapter error individually.
-- Clear metadata cache after adapter metadata fetch. Cached metadata values
-  may not be replace_metadata processed if fetched before their conditional
-  dependencies. Revealed by AO3 one-shots using title for chapter name.
-- ffnet fpcom, continue_on_chapter_error:true by default, increase sleep
-  times.
-- First rough version of reporting continue_on_chapter_error chapters.
-- Report chapter_error in custom error column and marked (when configured).
-- Update to cloudscraper v1.2.52
-- Increase times between retries on fetch error.
-- Tweek ffnet/fpcom sleep times again.
-- slow_down_sleep_time: randomize between 0.5 time and 1.5 time.
-- Report cloudscraper exceptions as such, plus hide the potentially misleading
-  'opensource' part.
-- adapter_fanficsme: do an extra fetch before login for cookie(?) Closes #633
-- adapter_webnovelcom: Fixes for site changes. Closes #629
-- quotev.com: site change in date parse, use utf8:ignore as first encoding
-  choice. Closes #625

