Private GIT
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SickRage-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vlbox
SickRage-1
Commits
ac23ff76
Commit
ac23ff76
authored
Sep 21, 2015
by
Dustyn Gibson
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix-2885' into develop
parents
90ea5d1d
0736f583
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sickbeard/providers/newznab.py
+26
-24
26 additions, 24 deletions
sickbeard/providers/newznab.py
with
26 additions
and
24 deletions
sickbeard/providers/newznab.py
+
26
−
24
View file @
ac23ff76
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with SickRage. If not, see <http://www.gnu.org/licenses/>.
# along with SickRage. If not, see <http://www.gnu.org/licenses/>.
# pylint: disable=W0703
import
urllib
import
urllib
import
time
import
time
...
@@ -23,14 +24,14 @@ import os
...
@@ -23,14 +24,14 @@ import os
import
re
import
re
import
sickbeard
import
sickbeard
import
generic
from
sickbeard.common
import
Quality
from
sickbeard
import
classes
from
sickbeard
import
classes
from
sickbeard
import
helpers
from
sickbeard
import
helpers
from
sickbeard
import
scene_exceptions
from
sickbeard
import
scene_exceptions
from
sickbeard
import
logger
from
sickbeard
import
logger
from
sickbeard
import
tvcache
from
sickbeard
import
tvcache
from
sickbeard
import
db
from
sickbeard
import
db
from
sickbeard.common
import
Quality
from
sickbeard.providers
import
generic
from
sickrage.helper.encoding
import
ek
from
sickrage.helper.encoding
import
ek
from
sickrage.helper.exceptions
import
AuthException
from
sickrage.helper.exceptions
import
AuthException
...
@@ -60,6 +61,8 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -60,6 +61,8 @@ class NewznabProvider(generic.NZBProvider):
else
:
else
:
self
.
needs_auth
=
True
self
.
needs_auth
=
True
self
.
public
=
not
self
.
needs_auth
if
catIDs
:
if
catIDs
:
self
.
catIDs
=
catIDs
self
.
catIDs
=
catIDs
else
:
else
:
...
@@ -106,7 +109,7 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -106,7 +109,7 @@ class NewznabProvider(generic.NZBProvider):
try
:
try
:
data
=
self
.
cache
.
getRSSFeed
(
"
%s/api?%s
"
%
(
self
.
url
,
urllib
.
urlencode
(
params
)))
data
=
self
.
cache
.
getRSSFeed
(
"
%s/api?%s
"
%
(
self
.
url
,
urllib
.
urlencode
(
params
)))
except
:
except
Exception
:
logger
.
log
(
u
"
Error getting html for [%s]
"
%
logger
.
log
(
u
"
Error getting html for [%s]
"
%
(
"
%s/api?%s
"
%
(
self
.
url
,
'
&
'
.
join
(
"
%s=%s
"
%
(
x
,
y
)
for
x
,
y
in
params
.
iteritems
()))),
logger
.
DEBUG
)
(
"
%s/api?%s
"
%
(
self
.
url
,
'
&
'
.
join
(
"
%s=%s
"
%
(
x
,
y
)
for
x
,
y
in
params
.
iteritems
()))),
logger
.
DEBUG
)
return
(
False
,
return_categories
,
"
Error getting html for [%s]
"
%
return
(
False
,
return_categories
,
"
Error getting html for [%s]
"
%
...
@@ -122,7 +125,7 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -122,7 +125,7 @@ class NewznabProvider(generic.NZBProvider):
return_categories
.
append
(
category
)
return_categories
.
append
(
category
)
for
subcat
in
category
.
subcats
:
for
subcat
in
category
.
subcats
:
return_categories
.
append
(
subcat
)
return_categories
.
append
(
subcat
)
except
:
except
Exception
:
logger
.
log
(
u
"
Error parsing result for [%s]
"
%
(
self
.
name
),
logger
.
log
(
u
"
Error parsing result for [%s]
"
%
(
self
.
name
),
logger
.
DEBUG
)
logger
.
DEBUG
)
return
(
False
,
return_categories
,
"
Error parsing result for [%s]
"
%
(
self
.
name
))
return
(
False
,
return_categories
,
"
Error parsing result for [%s]
"
%
(
self
.
name
))
...
@@ -210,10 +213,8 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -210,10 +213,8 @@ class NewznabProvider(generic.NZBProvider):
def
_checkAuthFromData
(
self
,
data
):
def
_checkAuthFromData
(
self
,
data
):
try
:
if
'
feed
'
not
in
data
or
'
entries
'
not
in
data
:
data
[
'
feed
'
]
return
self
.
_checkAuth
()
data
[
'
entries
'
]
except
:
return
self
.
_checkAuth
()
try
:
try
:
bozo
=
int
(
data
[
'
bozo
'
])
bozo
=
int
(
data
[
'
bozo
'
])
...
@@ -222,7 +223,7 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -222,7 +223,7 @@ class NewznabProvider(generic.NZBProvider):
err_desc
=
data
[
'
feed
'
][
'
error
'
][
'
description
'
]
err_desc
=
data
[
'
feed
'
][
'
error
'
][
'
description
'
]
if
not
err_code
or
err_desc
:
if
not
err_code
or
err_desc
:
raise
raise
except
:
except
Exception
:
return
True
return
True
if
err_code
==
100
:
if
err_code
==
100
:
...
@@ -270,10 +271,10 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -270,10 +271,10 @@ class NewznabProvider(generic.NZBProvider):
if
'
lolo.sickbeard.com
'
in
self
.
url
and
params
[
'
maxage
'
]
<
33
:
if
'
lolo.sickbeard.com
'
in
self
.
url
and
params
[
'
maxage
'
]
<
33
:
params
[
'
maxage
'
]
=
33
params
[
'
maxage
'
]
=
33
while
(
total
>=
offset
)
:
while
total
>=
offset
:
search_url
=
self
.
url
+
'
api?
'
+
urllib
.
urlencode
(
params
)
search_url
=
self
.
url
+
'
api?
'
+
urllib
.
urlencode
(
params
)
while
(
(
datetime
.
datetime
.
now
()
-
self
.
last_search
).
seconds
<
5
)
:
while
(
datetime
.
datetime
.
now
()
-
self
.
last_search
).
seconds
<
5
:
time
.
sleep
(
1
)
time
.
sleep
(
1
)
logger
.
log
(
u
"
Search url:
"
+
search_url
,
logger
.
DEBUG
)
logger
.
log
(
u
"
Search url:
"
+
search_url
,
logger
.
DEBUG
)
...
@@ -347,7 +348,7 @@ class NewznabProvider(generic.NZBProvider):
...
@@ -347,7 +348,7 @@ class NewznabProvider(generic.NZBProvider):
for
searchString
in
searchStrings
:
for
searchString
in
searchStrings
:
for
item
in
self
.
_doSearch
(
searchString
):
for
item
in
self
.
_doSearch
(
searchString
):
title
,
url
=
self
.
_get_title_and_url
(
item
)
title
,
url
=
self
.
_get_title_and_url
(
item
)
if
(
re
.
match
(
r
'
.*(REPACK|PROPER).*
'
,
title
,
re
.
I
)
)
:
if
re
.
match
(
r
'
.*(REPACK|PROPER).*
'
,
title
,
re
.
I
):
results
.
append
(
classes
.
Proper
(
title
,
url
,
datetime
.
datetime
.
today
(),
self
.
show
))
results
.
append
(
classes
.
Proper
(
title
,
url
,
datetime
.
datetime
.
today
(),
self
.
show
))
return
results
return
results
...
@@ -378,7 +379,7 @@ class NewznabCache(tvcache.TVCache):
...
@@ -378,7 +379,7 @@ class NewznabCache(tvcache.TVCache):
rss_url
=
self
.
provider
.
url
+
'
api?
'
+
urllib
.
urlencode
(
params
)
rss_url
=
self
.
provider
.
url
+
'
api?
'
+
urllib
.
urlencode
(
params
)
while
(
(
datetime
.
datetime
.
now
()
-
self
.
last_search
).
seconds
<
5
)
:
while
(
datetime
.
datetime
.
now
()
-
self
.
last_search
).
seconds
<
5
:
time
.
sleep
(
1
)
time
.
sleep
(
1
)
logger
.
log
(
self
.
provider
.
name
+
"
cache update URL:
"
+
rss_url
,
logger
.
DEBUG
)
logger
.
log
(
self
.
provider
.
name
+
"
cache update URL:
"
+
rss_url
,
logger
.
DEBUG
)
...
@@ -389,6 +390,7 @@ class NewznabCache(tvcache.TVCache):
...
@@ -389,6 +390,7 @@ class NewznabCache(tvcache.TVCache):
return
data
return
data
def
_checkAuth
(
self
,
data
):
def
_checkAuth
(
self
,
data
):
# pylint: disable=W0212
return
self
.
provider
.
_checkAuthFromData
(
data
)
return
self
.
provider
.
_checkAuthFromData
(
data
)
def
_parseItem
(
self
,
item
):
def
_parseItem
(
self
,
item
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment