Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
SiCKRAGE
sickrage
Commits
11ac4c6c
Commit
11ac4c6c
authored
Nov 16, 2018
by
echel0n
Browse files
Fixed Mako error related to no imdb_info present.
Refactored `episode_string_fallback` to list.
parent
4688a3ad
Changes
6
Hide whitespace changes
Inline
Side-by-side
changelog.md
View file @
11ac4c6c
# Changelog
-
*
fbe6cd3 - 2018-11-14: Release v9.4.34
-
*
225427c - 2018-11-16: Fixed Mako error related to no imdb_info present. Refactored
`
episode_string_fallback
`
to list.
-
*
70d42c2 - 2018-11-14: Release v9.4.34
-
*
4478e39 - 2018-11-14: Release v9.4.33
-
*
26b7be1 - 2018-11-14: Fixed NoneType issue with delete and update database function calls.
-
*
aaf7acf - 2018-11-12: Refactored new version string to web socket message.
...
...
sickrage/core/caches/tv_cache.py
View file @
11ac4c6c
...
...
@@ -186,10 +186,12 @@ class TVCache(object):
if
len
([
x
for
x
in
sickrage
.
app
.
cache_db
.
get_many
(
'providers'
,
self
.
providerID
)
if
x
[
'url'
]
==
url
]):
return
# ignore invalid urls
if
not
validate_url
(
url
)
and
not
url
.
startswith
(
'magnet'
)
\
or
is_ip_private
(
url
.
split
(
r
'//'
)[
-
1
].
split
(
r
'/'
)[
0
]):
return
# ignore invalid and private IP address urls
if
not
validate_url
(
url
):
if
not
url
.
startswith
(
'magnet'
):
return
elif
is_ip_private
(
url
.
split
(
r
'//'
)[
-
1
].
split
(
r
'/'
)[
0
]):
return
try
:
# parse release name
...
...
@@ -263,10 +265,12 @@ class TVCache(object):
and
"|"
+
str
(
ep_obj
.
episode
)
+
"|"
in
x
[
'episodes'
]):
result
=
self
.
provider
.
getResult
()
# ignore invalid urls
if
not
validate_url
(
curResult
[
"url"
])
and
not
curResult
[
"url"
].
startswith
(
'magnet'
)
\
or
is_ip_private
(
curResult
[
"url"
].
split
(
r
'//'
)[
-
1
].
split
(
r
'/'
)[
0
]):
continue
# ignore invalid and private IP address urls
if
not
validate_url
(
curResult
[
"url"
]):
if
not
curResult
[
"url"
].
startswith
(
'magnet'
):
continue
elif
is_ip_private
(
curResult
[
"url"
].
split
(
r
'//'
)[
-
1
].
split
(
r
'/'
)[
0
]):
continue
# ignored/required words, and non-tv junk
if
not
show_names
.
filterBadReleases
(
curResult
[
"name"
]):
...
...
sickrage/core/searchers/proper_searcher.py
View file @
11ac4c6c
...
...
@@ -124,7 +124,7 @@ class ProperSearcher(object):
continue
name
=
self
.
_genericName
(
x
.
name
)
if
n
ot
name
in
propers
:
if
n
ame
not
in
propers
:
sickrage
.
app
.
log
.
debug
(
"Found new proper: "
+
x
.
name
)
x
.
provider
=
providerObj
propers
[
name
]
=
x
...
...
sickrage/core/webserver/views/home/display_show.mako
View file @
11ac4c6c
...
...
@@ -241,7 +241,7 @@
</a>
% endfor
% endif
% if 'Year' in show.imdb_info:
% if
show.imdb_info and
'Year' in show.imdb_info:
% for imdbgenre in show.imdb_info['Genre'].replace('Sci-Fi','Science-Fiction').split(','):
<a href="${anon_url('http://trakt.tv/shows/popular/?genres=', imdbgenre.lower())}"
target="_blank"
...
...
sickrage/providers/__init__.py
View file @
11ac4c6c
...
...
@@ -41,8 +41,7 @@ from sickrage.core.caches.tv_cache import TVCache
from
sickrage.core.classes
import
NZBSearchResult
,
SearchResult
,
TorrentSearchResult
from
sickrage.core.common
import
MULTI_EP_RESULT
,
Quality
,
SEASON_RESULT
,
cpu_presets
from
sickrage.core.helpers
import
chmod_as_parent
,
findCertainShow
,
sanitizeFileName
,
clean_url
,
bs4_parser
,
\
validate_url
,
\
try_int
,
convert_size
validate_url
,
try_int
,
convert_size
from
sickrage.core.helpers.show_names
import
allPossibleShowNames
from
sickrage.core.nameparser
import
InvalidNameException
,
InvalidShowException
,
NameParser
from
sickrage.core.scene_exceptions
import
get_scene_exceptions
...
...
@@ -178,7 +177,7 @@ class GenericProvider(object):
for
show_name
in
allPossibleShowNames
(
episode
.
show
,
episode
.
scene_season
):
episode_string
=
show_name
+
self
.
search_separator
episode_string_fallback
=
None
episode_string_fallback
s
=
[]
if
episode
.
show
.
air_by_date
:
episode_string
+=
str
(
episode
.
airdate
).
replace
(
'-'
,
' '
)
...
...
@@ -187,14 +186,14 @@ class GenericProvider(object):
episode_string
+=
(
'|'
,
' '
)[
len
(
self
.
proper_strings
)
>
1
]
episode_string
+=
episode
.
airdate
.
strftime
(
'%b'
)
elif
episode
.
show
.
anime
:
# If the showname is a season scene exception, we want to use the indexer episode number.
# If the show
name is a season scene exception, we want to use the indexer episode number.
if
(
episode
.
scene_season
>
1
and
show_name
in
get_scene_exceptions
(
episode
.
show
.
indexerid
,
episode
.
scene_season
)):
# This is apparently a season exception, let's use the scene_episode instead of absolute
ep
=
episode
.
scene_episode
else
:
ep
=
episode
.
scene_absolute_number
episode_string_fallback
=
episode_string
+
'{episode:0>3}'
.
format
(
episode
=
ep
)
episode_string_fallback
s
+
=
[
episode_string
+
'{episode:0>3}'
.
format
(
episode
=
ep
)
]
episode_string
+=
'{episode:0>2}'
.
format
(
episode
=
ep
)
else
:
episode_string
+=
sickrage
.
app
.
naming_ep_type
[
2
]
%
{
...
...
@@ -204,11 +203,12 @@ class GenericProvider(object):
if
add_string
:
episode_string
+=
self
.
search_separator
+
add_string
if
episode_string_fallback
:
for
i
,
episode_string_fallback
in
enumerate
(
episode_string_fallback
s
)
:
episode_string_fallback
+=
self
.
search_separator
+
add_string
episode_string_fallbacks
[
i
]
=
episode_string_fallback
search_string
[
'Episode'
].
append
(
episode_string
.
strip
())
i
f
episode_string_fallback
:
f
or
episode_string_fallback
in
episode_string_fallback
s
:
search_string
[
'Episode'
].
append
(
episode_string_fallback
.
strip
())
return
[
search_string
]
...
...
@@ -331,7 +331,7 @@ class GenericProvider(object):
continue
try
:
parse_result
=
NameParser
().
parse
(
result
.
name
)
parse_result
=
NameParser
(
showObj
=
show
).
parse
(
result
.
name
)
except
(
InvalidNameException
,
InvalidShowException
)
as
e
:
sickrage
.
app
.
log
.
debug
(
"{}"
.
format
(
e
))
continue
...
...
@@ -343,7 +343,7 @@ class GenericProvider(object):
result
.
size
=
self
.
_get_size
(
item
)
result
.
seeders
,
result
.
leechers
=
self
.
_get_result_stats
(
item
)
sickrage
.
app
.
log
.
debug
(
"Adding item from search to cache:
"
+
result
.
name
)
sickrage
.
app
.
log
.
debug
(
"Adding item from search to cache:
{}"
.
format
(
result
.
name
)
)
self
.
cache
.
addCacheEntry
(
result
.
name
,
result
.
url
,
result
.
seeders
,
result
.
leechers
,
result
.
size
)
if
not
result
.
show
:
...
...
@@ -352,26 +352,26 @@ class GenericProvider(object):
if
not
(
result
.
show
.
air_by_date
or
result
.
show
.
sports
):
if
search_mode
==
'sponly'
:
if
len
(
parse_result
.
episode_numbers
):
sickrage
.
app
.
log
.
debug
(
"This is supposed to be a season pack search but the result "
+
result
.
name
+
" is not
a valid season pack, skipping it"
)
sickrage
.
app
.
log
.
debug
(
"This is supposed to be a season pack search but the result {} is not "
"
a valid season pack, skipping it"
.
format
(
result
.
name
)
)
continue
if
len
(
parse_result
.
episode_numbers
)
and
(
parse_result
.
season_number
not
in
set
([
ep
.
season
for
ep
in
episodes
])
or
not
[
ep
for
ep
in
episodes
if
ep
.
scene_episode
in
parse_result
.
episode_numbers
]):
sickrage
.
app
.
log
.
debug
(
"The result "
+
result
.
name
+
" doesn't seem to be a valid episode that we are trying to snatch, ignoring"
)
sickrage
.
app
.
log
.
debug
(
"The result {} doesn't seem to be a valid episode that we are trying "
"to snatch, ignoring"
.
format
(
result
.
name
)
)
continue
else
:
if
not
len
(
parse_result
.
episode_numbers
)
and
parse_result
.
season_number
and
not
[
ep
for
ep
in
episodes
if
ep
.
season
==
parse_result
.
season_number
and
ep
.
episode
in
parse_result
.
episode_numbers
]:
sickrage
.
app
.
log
.
debug
(
"The result "
+
result
.
name
+
" doesn't seem to be a valid season that we are trying to snatch, ignoring"
)
sickrage
.
app
.
log
.
debug
(
"The result {} doesn't seem to be a valid season that we are trying to "
"snatch, ignoring"
.
format
(
result
.
name
)
)
continue
elif
len
(
parse_result
.
episode_numbers
)
and
not
[
ep
for
ep
in
episodes
if
ep
.
season
==
parse_result
.
season_number
and
ep
.
episode
in
parse_result
.
episode_numbers
]:
sickrage
.
app
.
log
.
debug
(
"The result "
+
result
.
name
+
" doesn't seem to be a valid episode that we are trying to snatch, ignoring"
)
sickrage
.
app
.
log
.
debug
(
"The result {} doesn't seem to be a valid episode that we are trying "
"to snatch, ignoring"
.
format
(
result
.
name
)
)
continue
# we just use the existing info for normal searches
...
...
sickrage/providers/torrent/yggtorrent.py
View file @
11ac4c6c
...
...
@@ -48,23 +48,6 @@ class YggtorrentProvider(TorrentProvider):
# Proper Strings
self
.
proper_strings
=
[
'PROPER'
,
'REPACK'
,
'REAL'
,
'RERIP'
]
# Miscellaneous Options
self
.
translation
=
{
'seconde'
:
'second'
,
'secondes'
:
'seconds'
,
'minute'
:
'minute'
,
'minutes'
:
'minutes'
,
'heure'
:
'hour'
,
'heures'
:
'hours'
,
'jour'
:
'day'
,
'jours'
:
'days'
,
'mois'
:
'month'
,
'an'
:
'year'
,
'année'
:
'year'
,
'ans'
:
'years'
,
'années'
:
'years'
}
# Torrent Stats
self
.
minseed
=
None
self
.
minleech
=
None
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment