From c0fae0dac5736d7ad08616d7df33d1f33c49e133 Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Fri, 17 Mar 2017 01:57:08 +0000
Subject: [PATCH] Change SpeedCD to cookie auth as username/password is not
 reliable.

Change Usenet-Crawler media provider icon.
---
 CHANGES.md                                    |   8 +++++++-
 gui/slick/images/providers/usenet_crawler.png | Bin 818 -> 381 bytes
 sickbeard/providers/generic.py                |   2 +-
 sickbeard/providers/speedcd.py                |  14 +++++++++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 86ac3700..15ce2f7b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
-### 0.12.10 (2017-03-12 16:00:00 UTC)
+### 0.12.11 (2017-03-17 02:00:00 UTC)
+
+* Change SpeedCD to cookie auth as username/password is not reliable
+* Change Usenet-Crawler media provider icon
+
+
+### 0.12.10 (2017-03-12 16:00:00 UTC)
 
 * Change refactor client for Deluge 1.3.14 compatibility
 * Change ensure IPT authentication is valid before use
diff --git a/gui/slick/images/providers/usenet_crawler.png b/gui/slick/images/providers/usenet_crawler.png
index 5c48557d044c1aeef61c47d19261d7274008610b..a9db128762b1eeb6a947e80512252363887476bf 100644
GIT binary patch
delta 355
zcmV-p0i6D_2K@q%BYy!zNkl<ZILpn_u}hUv7{~F?`}T?$b&VR@LP@B&gdl>^B5p#^
zkYihaMc_Xmu7ZC-OVHrrYM`Q9Q6ZISZ4Rasrg<f}x8?VW$aSu>Jm);;JiqgO9)A4m
zRm?0-JVc2N{K)=3`tdRE?%^Q&26k}+oeHnehbb(f7qb}0Q-2hAfwhP~z)L(vtHOGU
ze&&ZZ-ly<;;xay96Dzs@ia!-bLePjniMtrX^_<6WjA^u<KYD#SgDT3s_;rS03s*x`
z;B9j4^FyrA#N`y!1h+AaYY`ZZSlLZrqYJ@yTB-@&CD)bUPG)fB48cIi8aX$ye-XjA
z5R|x;xPvb^3|zrhayL=VEKVGy?M{V3^x#Rn@FpTdp{i%HhdGR50h2hXeQ*h%v6`O?
z{EiRG_~28hTY1~4eef(79n7C=v6HyoC13b2)?eD;Ou`d;64?L%002ovPDHLkV1k%0
Bt*HP2

delta 796
zcmV+%1LOSt0<s2>BYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
z)Ja4^RCwA%lUYbrQ51&1bM<=l=8#vzAu6>jp|a^VC`AKB0}+&EP#FdVQa#vPAVC8a
zL=QnDMh^{?FF{aAM$jbEM5RT8X=T}MQgOKEd{6)B+&CLHn}4<T`v1Mwzt%QP(*({!
zs9$F!xJJV3lbiWcy^-VzdGvLGX%6u1!+z$MTqS*ZGXxYHp}oyQSSuu8f{tJ`HD%`s
z8HMDm1K%j{#6wRzjCgg77njN~B8o{{QVBo*A;SbQ+GZ^GkKV=W^OIjHTR=Lshjc9>
z-vaII5!4*N$$z5M`6NtzU?E*LfnI-BejHDnpV<dxM{75$who;=c8K+2%3_$j8lGP~
zNcTG&g0`pAXbTjRw@bzk=(R3m4a_K&r6eDpg8G~Cb;Gy<`HZ<#9m#eGK0PTReF_-z
zy{v!>`{46K*~6jrqpFieeFFD3+u8cYs;tDdjs`u!6n`>iS!wHDU0Aw9r=>wFB&M3o
zDK+4a<Y>2bNzSx7Gt(h3T_K_c=u@4UE9LOnU`vC@7(M?-J@cw_aWL4T>XM<U&U6U+
z`$NR&@@t*MJOSgUL;5%vo+^+hf}uWWc>{I#AVdDFe5-n|L*R*Z^Xm(YUIve@!}%);
zv~*Nfo_}F_K*Q7&v=f`R#a3=`$Z$lAO@2=ETU)gChrvG@zRCYv^#;B}L(uMQ(IK5;
zZf#Q8#(+aGCbxnX1)B9TL{hj{B$J@s?kYYFTG4I^JJFttuZnX=2ONUL-1m6nFLVEj
zJ>xFvQ6Rv&O|WbQY~2HCv%-@pVH;m*9{krVsDEL9rc2P(7QwBPjbu(8gMWklKZpu{
znxNGxTe9m1RC3Y{7H(J2>aH-s8M}4;9ZR@<t{lUiLCzeBD#hIrdr)bAYJl1*W#_uX
znw_geE@#pI49deVCTSJ|UTUjL2zD-}vn!p!UbnL7#T^wOE4z}M8K*InNo3@|@BCMQ
a0TlqI{OC3bK#LUs0000<MNUMnLSTZyMRvac

diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index 540272ed..2cd2cd37 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -646,7 +646,7 @@ class GenericProvider:
         if hasattr(self, 'cookies'):
             cookies = self.cookies
 
-            if not (cookies and re.match('^(\w+=\w+[;\s]*)+$', cookies)):
+            if not (cookies and re.match('^(?:\w+=[^;\s]+[;\s]*)+$', cookies)):
                 return False
 
             cj = requests.utils.add_dict_to_cookiejar(self.session.cookies,
diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py
index 0da4904e..f09a259f 100644
--- a/sickbeard/providers/speedcd.py
+++ b/sickbeard/providers/speedcd.py
@@ -30,7 +30,7 @@ class SpeedCDProvider(generic.TorrentProvider):
 
         self.url_base = 'https://speed.cd/'
         self.urls = {'config_provider_home_uri': self.url_base,
-                     'login_action': self.url_base + 'login.php',
+                     'login': self.url_base + 'rss.php',
                      'search': self.url_base + 'V3/API/API.php',
                      'get': self.url_base + '%s'}
 
@@ -39,12 +39,15 @@ class SpeedCDProvider(generic.TorrentProvider):
 
         self.url = self.urls['config_provider_home_uri']
 
-        self.username, self.password, self.freeleech, self.minseed, self.minleech = 5 * [None]
+        self.digest, self.freeleech, self.minseed, self.minleech = 4 * [None]
 
     def _authorised(self, **kwargs):
 
         return super(SpeedCDProvider, self)._authorised(
-            logged_in=(lambda y=None: self.has_all_cookies('inSpeed_speedian')))
+            logged_in=(lambda y='': all(
+                ['RSS' in y, 'type="password"' not in y, self.has_all_cookies(['uid', 'speedian'], 'inSpeed_')] +
+                [(self.session.cookies.get('inSpeed_' + x) or 'sg!no!pw') in self.digest for x in 'uid', 'speedian'])),
+            failed_msg=(lambda y=None: u'Invalid cookie details for %s. Check settings'))
 
     def _search_provider(self, search_params, **kwargs):
 
@@ -115,5 +118,10 @@ class SpeedCDProvider(generic.TorrentProvider):
 
         return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='.', **kwargs)
 
+    @staticmethod
+    def ui_string(key):
+
+        return 'speedcd_digest' == key and 'use... \'inSpeed_uid=xx; inSpeed_speedian=yy\'' or ''
+
 
 provider = SpeedCDProvider()