From 1c4d2a1854829c4cd8959e9ad31cc232703f9ca3 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 4 Feb 2021 11:37:41 +0000 Subject: [PATCH] Fix report correct number of items found during nzb search. Change recognise custom spotweb providers. --- CHANGES.md | 8 +++++++- gui/slick/images/providers/nzbgeek.png | Bin 747 -> 813 bytes sickbeard/providers/newznab.py | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 13fdb18..3b860ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,10 @@ -### 0.23.10 (2021-01-30 11:20:00 UTC) +### 0.23.11 (2021-02-04 23:30:00 UTC) + +* Fix report correct number of items found during nzb search +* Change recognise custom spotweb providers + + +### 0.23.10 (2021-01-30 11:20:00 UTC) * Fix change file date on non Windows diff --git a/gui/slick/images/providers/nzbgeek.png b/gui/slick/images/providers/nzbgeek.png index 0a2ddb86ae3071e9442968947c4b9e42fd4221a1..ee14be6aadfaba48802dba3e5e85d438d27dee5c 100644 GIT binary patch delta 801 zcmV++1K#}W1+4~<8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m<*G;|a*4hEKPchx&dyH1R;vy0 z`TWn5lapdLwGSQsV;s_7f6){kY10oaN~Kb8xm*avl5L)Asfw-oJ4X%v28kz;4yDpi ztJNS$5?fnaaDTa6;NNV3cm_-(dXx|l3mU`329V@0cbQD)Ya8Nr_;e;Fo0SC zfj|KL;}*;WgHZJ7QEdvpBm{dNDK*U8uqW0qJw1)u+FCdq4mh1ojGLe0OKubG9UW-W z4Z)lIist5KL^7Kw9|*Rwa+F-3T8tG61t=5>@OV6gLVqC$1Om)_T!PlS2>WXnY&IKO zTU#L#iI7gGA$^zlMkw7U2o4!M-@mX5kH^E9C6P!VlgXITtyU}2-}5k=&B*8Th(@F6 z?d?T49EN9Q1BXc8HG+5)xIC4}GQzR3F(eWR>h}P<-Hw))7Rcpt<^h^qE(fJjiBu|u z*m@oZNq^rhf}@|kpmfbcC=`PFXQq&Lo$el_Oruw$Sy@>@V`Jm*2JX}b4)l4sj0d6# z-=|C_1FzT17)Xoa@i=N~u0W;gV$3xfjm+*lNZ%&&M9*wFV9E}q8N)|V|W-^cf0Pdf zy9s0LPw_5g)LuVHGO%s2q#oFUA4d9LMALlX>U{TO>tS8sEL*le)TAYJut%a;ES{pG fj2b=efgpYXIHDG!hzl1Qmkk=NlGxBfn^0*gA%7`p=oBg)2Jg(=d(Sy6 zboneFzBO}3C~z1+(p?DvVl;7r9*h>KY9axyF)*4dV3DzKCuMBpr9yQ7QA^bdSOLH^ zhG<$)LNpkhjIk(mYI5?zrwc>Xs(T6EdAQvi9jo<)>hki^)o-r}Md6X=5UOUUCQp3+ z*(K=kN5|CdNuFw{Y)%1%j3kW=;KIU13-q*icXQ+GYu~q@rAHg1Utazq zBz>kHg{lTaRG2GAYPHhfh*@i}G;rmc?>e2HxOa=JCE4~re;yp#S9KE)E^&OWUa5Q1 zuHI;W6^g^Bhdw?zpX@v+C!uJ7#KDvs60 z&rHu$F^sLDJL_Am4d32;5})pMNSOKh?^_?u&xa(QogI7kjdPh>IY}(bLX4q!@b5ua z-24bfZ9-PcINfw?(W0pt^==5pFID`g_!h<#O0eS zF_v=GAQC~)VP=&|-}@hYm}kBI7Y=Jt00jU?zE`on`uDwi4iAKzMstt^ Union[datetime.date, None] + # type: (etree.Element, Union[int, None]) -> Union[datetime.datetime, None] """ :param item: @@ -865,12 +871,12 @@ class NewznabProvider(generic.NZBProvider): if v in self.caps]), 'offset': 0} - uc_only = all([re.search('(?i)usenet_crawler', self.get_id())]) - base_params_uc = {'num': self.limits, 'dl': '1', 'i': '64660'} + use_rss = self.get_id() in ('ninjacentral', ) + base_params_rss = {'num': self.limits, 'dl': '1', 'i': '19'} if isinstance(api_key, string_types) and api_key not in ('0', ''): base_params['apikey'] = api_key - base_params_uc['r'] = api_key + base_params_rss['r'] = api_key results, n_spaces = [], {} total, cnt, search_url, exit_log = 0, len(results), '', True @@ -916,7 +922,7 @@ class NewznabProvider(generic.NZBProvider): if self.cat_ids or len(cat): base_params['cat'] = ','.join(sorted(set((self.cat_ids.split(',') if self.cat_ids else []) + cat))) - base_params_uc['t'] = base_params['cat'] + base_params_rss['t'] = base_params['cat'] request_params = base_params.copy() # if ('Propers' == mode or 'nzbs_org' == self.get_id()) \ @@ -942,8 +948,8 @@ class NewznabProvider(generic.NZBProvider): while (offset <= total) and (offset < max_items) and batch_count: cnt = len(results) - if 'Cache' == mode and uc_only: - search_url = '%srss?%s' % (self.url, urlencode(base_params_uc)) + if 'Cache' == mode and use_rss: + search_url = '%srss?%s' % (self.url, urlencode(base_params_rss)) else: search_url = '%sapi?%s' % (self.url, urlencode(request_params)) i and time.sleep(2.1) @@ -992,7 +998,7 @@ class NewznabProvider(generic.NZBProvider): offset = helpers.try_int(parsed_xml.find('.//%sresponse' % n_spaces['newznab']).get('offset', 0)) except (AttributeError, KeyError): - if not uc_only: + if not use_rss: break total = len(items) @@ -1007,7 +1013,7 @@ class NewznabProvider(generic.NZBProvider): first_date = self._parse_pub_date(items[0]) last_date = self._parse_pub_date(items[-1]) if not first_date or not last_date or not self.last_recent_search or \ - last_date <= self.last_recent_search or uc_only: + last_date <= self.last_recent_search or use_rss: break if offset != request_params['offset']: @@ -1030,7 +1036,7 @@ class NewznabProvider(generic.NZBProvider): self.last_recent_search = first_date if exit_log: - self._log_search(mode, total, search_url) + self._log_search(mode, len(results), search_url) if not try_all_searches and any([x in request_params for x in [ v for c, v in iteritems(self.caps)