From 021459c280f450beecb8118d1f602d8d41a33b47 Mon Sep 17 00:00:00 2001 From: evilhero Date: Fri, 2 Dec 2016 12:45:49 -0500 Subject: [PATCH] FIX:(#1466) When post-processing if filename did not have issue year or volume, would error, IMP:(#1418) Separate copy/move/hardlink/symlink option for Story arcs, IMP:(#1417) Added story arc format folder to story arc options - can now specify folder format for story arc naming, IMP:(#1374) Added rtorrent_authentication to config.ini allowing user to specify digest/basic authentication, as well as the rpc_url (rtorrent_rpc_url) and ssl (rtorrent_ssl). Rtorrent_host no longer requires protocol in field, IMP: Instead of hitting the intermediary/32P site to get the torrent group, will now retain specific id for torrent group to speed up searches, FIX: (#1472) Fixed some problems with series being searched against 32P which had special characters and would return no results, FIX: Added some specific exception catches when attempting to retrieve search results for nzb providers, FIX: Fixed publisher retaining problem for story arcs (note story arcs will have to be refreshed), FIX: Fixed a problem with the pull-list matching up to the correct series when the issue was an annual for a given series with the alt_pull 2 method (would create an invalid link on the Wanted tab), IMP:(#1470) Added config.ini option to specify folder-formatting for weekly folder numbering, 0=YYYY-WN, 1=YYYY-MM-DD, IMP: (#1471) Added quick check to ensure that newznab host entries do not contain leading/trailing spaces and will strip accordingly, FIX:(#1476) Annuals now have option to add to reading list via the series detail page, IMP: Fixed password fields to allow for special characters within password, IMP: Weekly pull will now correctly show status for previous/future weeks for watchlisted series, IMP: Download option on pullist will work for previous weeks, FIX: Fixed some issues with one-off and story arc post-processing using different file operations, FIX: Fixed error when performing an 'Force Update Active Comics' from the Manage tab (or the scheduled updating of all active comics), IMP: Storyarc issues that are not on watchlist will now retain value for volume to help when searching and file-checking/post-processing, FIX:(#1473) Changed pullist dates on pullist page to unicode to allow for non-English presentation --- data/interfaces/default/comicdetails.html | 2 + data/interfaces/default/config.html | 51 +++- data/interfaces/default/storyarc.html | 57 +++- data/interfaces/default/weeklypull.html | 2 +- lib/rtorrent/__init__.py | 113 ++------ lib/rtorrent/common.py | 67 ++++- lib/rtorrent/connection.py | 165 ++++++++++++ lib/rtorrent/lib/xmlrpc/clients/__init__.py | 0 lib/rtorrent/lib/xmlrpc/{ => clients}/http.py | 0 lib/rtorrent/lib/xmlrpc/clients/scgi.py | 152 +++++++++++ .../lib/xmlrpc/transports/__init__.py | 0 .../lib/xmlrpc/{ => transports}/basic_auth.py | 38 ++- .../lib/xmlrpc/transports/requests_.py | 91 +++++++ .../lib/xmlrpc/{ => transports}/scgi.py | 72 +---- lib/rtorrent/rpc/__init__.py | 6 +- mylar/PostProcessor.py | 59 ++--- mylar/__init__.py | 52 +++- mylar/auth32p.py | 245 ++++++++++-------- mylar/cv.py | 96 ++++++- mylar/filechecker.py | 2 +- mylar/helpers.py | 180 ++++++++++++- mylar/locg.py | 3 +- mylar/mb.py | 12 +- mylar/notifiers.py | 7 +- mylar/search.py | 36 +-- mylar/test.py | 3 +- mylar/torrent/clients/rtorrent.py | 45 +++- mylar/updater.py | 27 +- mylar/webserve.py | 245 +++++++++++------- mylar/weeklypull.py | 22 +- 30 files changed, 1355 insertions(+), 495 deletions(-) create mode 100644 lib/rtorrent/connection.py create mode 100644 lib/rtorrent/lib/xmlrpc/clients/__init__.py rename lib/rtorrent/lib/xmlrpc/{ => clients}/http.py (100%) create mode 100644 lib/rtorrent/lib/xmlrpc/clients/scgi.py create mode 100644 lib/rtorrent/lib/xmlrpc/transports/__init__.py rename lib/rtorrent/lib/xmlrpc/{ => transports}/basic_auth.py (70%) create mode 100644 lib/rtorrent/lib/xmlrpc/transports/requests_.py rename lib/rtorrent/lib/xmlrpc/{ => transports}/scgi.py (74%) diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html index 6699d874..fccad32a 100644 --- a/data/interfaces/default/comicdetails.html +++ b/data/interfaces/default/comicdetails.html @@ -626,6 +626,8 @@ --> + + diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 5a0c21b4..2393f90a 100755 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -150,7 +150,7 @@
- +
@@ -283,7 +283,7 @@
- +
@@ -349,7 +349,7 @@
- +
@@ -438,7 +438,7 @@
- +
@@ -457,7 +457,7 @@
- +
@@ -466,11 +466,37 @@
- Will *ONLY* work if rtorrent has RPC Support
- + - ie. https://my.rtorrent:80/myuser/RPC1 + ie. my.rtorrent:80, 192.168.1.1, scgi://localhost:5000 +
+
+ +
+
+
+ +
+
+
+ + +
+
+ + + ie. httprpc plugin = rutorrent/plugins/httprpc/action.php
rpc plugin = user/RPC2
@@ -478,10 +504,10 @@
- +
- +
Folder path where torrent download will be assigned
@@ -506,7 +532,7 @@
- +
@@ -624,7 +650,7 @@
- + ( monitor the NEW releases feed & your personal notifications )
@@ -1674,6 +1700,7 @@ initConfigCheckbox("#enforce_perms"); initConfigCheckbox("#enable_api"); initConfigCheckbox("#sab_to_mylar"); + initConfigCheckbox("#rtorrent_ssl"); initConfigCheckbox("#usenewznab"); initConfigCheckbox("#enable_torznab"); initConfigCheckbox("#usenzbsu"); diff --git a/data/interfaces/default/storyarc.html b/data/interfaces/default/storyarc.html index e91082d1..c64dda6b 100755 --- a/data/interfaces/default/storyarc.html +++ b/data/interfaces/default/storyarc.html @@ -39,7 +39,7 @@
+ (this.value==this.defaultValue) this.value='';" name="filename" size="45" />
@@ -48,12 +48,43 @@
Options -
+
<% storyarcdest = os.path.join(mylar.DESTINATION_DIR, 'StoryArcs') %> - - + +
+
+
+ + +
+
+
+ <% + if mylar.STORYARCDIR: + carcdir = 'StoryArc' + else: + carcdir = 'GrabBag' + %> + +
@@ -132,6 +163,24 @@