Skip to content

Commit

Permalink
Fixed tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ofir123
ofir123 committed May 8, 2019
1 parent 75d92a8 commit d291a84
Show file tree
Hide file tree
Showing 11 changed files with 1,581 additions and 3,470 deletions.
12 changes: 9 additions & 3 deletions subliminal/providers/wizdom.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ def get_matches(self, video):
if video.series_imdb_id and self.imdb_id == video.series_imdb_id:
matches.add('series_imdb_id')
# guess
matches |= guess_matches(video, guessit(self.release, {'type': 'episode'}))
matches |= guess_matches(video, guessit(self.release, {'type': 'episode'}), partial=True)
# movie
elif isinstance(video, Movie):
# guess
matches |= guess_matches(video, guessit(self.release, {'type': 'movie'}))
matches |= guess_matches(video, guessit(self.release, {'type': 'movie'}), partial=True)

# title
if video.title and (sanitize(self.title) in (
Expand Down Expand Up @@ -142,7 +142,13 @@ def query(self, title, season=None, episode=None, year=None, filename=None, imdb

# filter irrelevant results
if not is_movie:
results = results.get('subs', {}).get(str(season), {}).get(str(episode), [])
results = results.get('subs', [])
# there are two formats of result jsons - seasons list and seasons dict
if isinstance(results, list):
results = results[season] if len(results) >= season else {}
else:
results = results.get(str(season), {})
results = results.get(str(episode), [])
else:
results = results.get('subs', [])

Expand Down
224 changes: 98 additions & 126 deletions tests/cassettes/wizdom/test_download_subtitle.yaml
View file

Large diffs are not rendered by default.

1,623 changes: 443 additions & 1,180 deletions tests/cassettes/wizdom/test_list_subtitles_episode.yaml
View file

Large diffs are not rendered by default.

81 changes: 36 additions & 45 deletions tests/cassettes/wizdom/test_list_subtitles_episode_alternative_series.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,45 @@ interactions:
method: GET
uri: http://json.wizdom.xyz/tt2543328.json
response:
body: {string: "{\"title\":\"\u05D4\u05DE\u05E8\u05D2\u05DC\u05D9\u05DD \u05DE\u05D5\u05D5\u05E9\u05D9\u05E0\u05D2\u05D8\u05D5\u05DF\",\"title_en\":\"TURN:
Washington's Spies\",\"year\":\"2014\",\"rating\":\"8.00\",\"votes\":\"13387\",\"release\":\"06\\/04\\/2014\",\"imdb\":\"tt2543328\",\"poster\":\"http:\\/\\/posters.wizdom.xyz\\/tt2543328.jpg\",\"plot\":\"\u05E1\u05D9\u05E4\u05D5\u05E8\u05D4
\u05E9\u05DC \u05E8\u05E9\u05EA \u05D4\u05E8\u05D9\u05D2\u05D5\u05DC \u05D4\u05E8\u05D0\u05E9\u05D5\u05E0\u05D4
\u05E9\u05DC \u05D0\u05DE\u05E8\u05D9\u05E7\u05D4: \u05D4\u05D3\u05E8\u05DE\u05D4
\u05D4\u05D7\u05D3\u05E9\u05D4 \u05D5\u05D4\u05DE\u05D1\u05D8\u05D9\u05D7\u05D4
\u05DE\u05D1\u05D9\u05EA \u05D0\u05D9\u05D9-\u05D0\u05DD-\u05E1\u05D9, \u05DE\u05D1\u05D5\u05E1\u05E1\u05EA
\u05E2\u05DC \u05D4\u05E1\u05E4\u05E8 \\\"\u05D4\u05DE\u05E8\u05D2\u05DC\u05D9\u05DD
\u05DE\u05D5\u05D5\u05E9\u05D9\u05E0\u05D2\u05D8\u05D5\u05DF\\\" \u05D5\u05DE\u05EA\u05E8\u05D7\u05E9\u05EA
\u05D1\u05E7\u05D9\u05E5 1778, \u05D1\u05E2\u05D9\u05E6\u05D5\u05DE\u05D5
\u05E9\u05DC \u05D4\u05DB\u05D9\u05D1\u05D5\u05E9 \u05D4\u05D1\u05E8\u05D9\u05D8\u05D9,
\u05DB\u05E9\u05D7\u05E7\u05DC\u05D0\u05D9 \u05DE\u05E0\u05D9\u05D5 \u05D9\u05D5\u05E8\u05E7
\u05D5\u05D7\u05D1\u05E8\u05D9 \u05D4\u05D9\u05DC\u05D3\u05D5\u05EA \u05E9\u05DC\u05D5
\u05D9\u05D5\u05E6\u05E8\u05D9\u05DD, \u05D1\u05E2\u05D9\u05D3\u05D5\u05D3\u05D5
\u05E9\u05DC \u05D2'\u05D5\u05E8\u05D2' \u05D5\u05D5\u05E9\u05D9\u05E0\u05D2\u05D8\u05D5\u05DF,
\u05E7\u05D1\u05D5\u05E6\u05D4 \u05DC\u05D0 \u05E9\u05D2\u05E8\u05EA\u05D9\u05EA
\u05E9\u05DC \u05DE\u05E8\u05D2\u05DC\u05D9\u05DD \u05E9\u05E0\u05E7\u05E8\u05D0\u05EA
\\\"\u05DE\u05E2\u05D2\u05DC \u05E7\u05D5\u05DC\u05E4\u05E8\\\", \u05E7\u05D1\u05D5\u05E6\u05D4
\u05E9\u05D1\u05E1\u05D5\u05E4\u05D5 \u05E9\u05DC \u05D3\u05D1\u05E8 \u05EA\u05D8\u05D4
\u05D0\u05EA \u05D4\u05DB\u05E3 \u05DC\u05D8\u05D5\u05D1\u05EA \u05D4\u05DE\u05D4\u05E4\u05DB\u05E0\u05D9\u05DD
\u05D1\u05DE\u05DC\u05D7\u05DE\u05EA \u05D4\u05E2\u05E6\u05DE\u05D0\u05D5\u05EA
\u05D4\u05D0\u05DE\u05E8\u05D9\u05E7\u05D0\u05D9\u05EA. \u05D1\u05EA\u05E4\u05E7\u05D9\u05D3
\u05D4\u05E8\u05D0\u05E9\u05D9 \u05DE\u05DB\u05DB\u05D1 \u05D2'\u05D9\u05D9\u05DE\u05D9
\u05D1\u05DC (\u05DC\u05E9\u05E2\u05D1\u05E8 \u05D4\u05D9\u05DC\u05D3 \u05D4\u05D7\u05DE\u05D5\u05D3
\u05D1\u05D9\u05DC\u05D9 \u05D0\u05DC\u05D9\u05D5\u05D8).\\r\\n\",\"type\":\"tv\",\"tvdb\":\"272135\",\"geners\":[\"\u05D4\u05E8\u05E4\u05EA\u05E7\u05D0\u05D5\u05EA\",\"\u05D3\u05E8\u05DE\u05D4\"],\"subs\":{\"1\":{\"1\":[{\"id\":\"125538\",\"version\":\"Turn.S01E01.720p.HDTV.X264-DIMENSION\",\"date\":\"2017-01-02
15:25:02\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"DIMENSION\"},{\"id\":\"125539\",\"version\":\"Turn.S01E01.HDTV.x264-2HD\",\"date\":\"2017-01-02
15:26:01\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"2HD\"},{\"id\":\"125543\",\"version\":\"Turn.S01E01.Pilot.1080p.WEB-DL.DD5.1.H.264-EbP\",\"date\":\"2017-01-02
15:27:03\",\"resolution\":\"1080p\",\"format\":\"WEB-DL\",\"video_codec\":\"h264\",\"audio_codec\":\"DolbyDigital\",\"release_group\":\"EbP\"}],\"2\":[{\"id\":\"172742\",\"version\":\"Turn.S01E02.720p.HDTV.x264-REMARKABLE\",\"date\":\"2017-02-15
16:17:56\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"REMARKABLE\"},{\"id\":\"172743\",\"version\":\"Turn.S01E02.HDTV.x264-KILLERS\",\"date\":\"2017-02-15
16:17:57\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"KILLERS\"}],\"7\":[{\"id\":\"170138\",\"version\":\"Turn.S01E07.720p.HDTV.X264-DIMENSION\",\"date\":\"2017-01-29
19:07:30\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"DIMENSION\"}],\"9\":[{\"id\":\"170290\",\"version\":\"Turn.S01E09.720p.HDTV.x264-IMMERSE\",\"date\":\"2017-01-30
18:00:12\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"IMMERSE\"},{\"id\":\"170291\",\"version\":\"Turn.S01E09.HDTV.x264-KILLERS\",\"date\":\"2017-01-30
18:00:12\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"KILLERS\"}],\"10\":[{\"id\":\"172370\",\"version\":\"Turn.S01E10.720p.HDTV.x264-KILLERS\",\"date\":\"2017-02-12
20:17:21\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"KILLERS\"}]},\"4\":{\"1\":[{\"id\":\"185603\",\"version\":\"Turn.Washington.Spies.S04E01.720p.HDTV.x264-AVS\",\"date\":\"2017-06-28
22:11:47\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"AVS\"}],\"3\":[{\"id\":\"187862\",\"version\":\"Turn.S04E03.WEBRip.x264-RARBG\",\"date\":\"2017-07-12
13:37:41\",\"format\":\"WEBRip\",\"video_codec\":\"h264\",\"release_group\":\"RARBG\"}],\"4\":[{\"id\":\"185800\",\"version\":\"Turn.S04E04.XviD-AFG\",\"date\":\"2017-07-05
19:15:04\",\"video_codec\":\"XviD\",\"release_group\":\"AFG\"}],\"5\":[{\"id\":\"188442\",\"version\":\"Turn.S04E05.720p.HDTV.x264-AVS\",\"date\":\"2017-07-24
15:00:06\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"AVS\"}],\"6\":[{\"id\":\"188869\",\"version\":\"Turn.Washingtons.Spies.S04E06.720p.HDTV.x264-AVS\",\"date\":\"2017-08-01
17:29:24\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"AVS\"},{\"id\":\"188871\",\"version\":\"Turn.Washingtons.Spies.S04E06.HDTV.x264-SVA\",\"date\":\"2017-08-01
17:30:02\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"SVA\"}],\"7\":[{\"id\":\"188985\",\"version\":\"Turn.S04E07.720p.HDTV.x264-AVS\",\"date\":\"2017-08-03
05:00:07\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"AVS\"},{\"id\":\"188986\",\"version\":\"Turn.S04E07.HDTV.x264-SVA\",\"date\":\"2017-08-03
05:00:07\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"SVA\"}],\"9\":[{\"id\":\"189942\",\"version\":\"Turn.S04E09.720p.HDTV.x264-AVS\",\"date\":\"2017-08-25
00:10:07\",\"resolution\":\"720p\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"AVS\"},{\"id\":\"189943\",\"version\":\"Turn.S04E09.HDTV.x264-SVA\",\"date\":\"2017-08-25
00:10:08\",\"format\":\"HDTV\",\"video_codec\":\"h264\",\"release_group\":\"SVA\"}]}}}"}
body:
string: !!binary |
H4sIAAAAAAAAA7SWbW/aSBDHv4q1b3InGbO7ft53qaDXqEmvgl5bqVQVKb7UJ4IRdtKrqnwHCFiJ
FcIluVwCfKH5OqdZJ8UQ3KZ5eIPwPsz85r8zs/uVRH7U9IggMIARjGEfhpDAsQIjiCGGCSRwAvtw
CDH8Q9R09QevRQR59UflhVDe1MNPfmsrCloroVJt+15IVPLFq3eIIJwyg6ikU4/81hYRxNEYJSrZ
DSIvJIIwy+YuzntNrx4iA7VqRWrUilcb/e3GJhEkirhp6Dp3iEraQRh5aPtTFLVDUSvWip8/f9ai
T16029jUPgbbteJmvdXyOmGtmC4Oa0Vuc6abBab91d5CI80gwohPIYFziGEMAwUmMFRgDBOYKjCA
MSSwDzGO4UcXJhDDybd1XalVApcwELiiD2MY4ewADqAPE/wbS0V7cAgJHOAAfiRovgsJJAXownEB
GdR0KoZTOMXps9TrKZzDWKnd5mBqBN2NYApjOEhD6MElJPCfwmzbUfHzDBK4kKviqyAGcASJdDzB
j56M6FDyHMEEDuAShsiKLk8gwX2JVOsSvR2kG3BnAkPoQ4xuJzC8Xnch7R1/c44r+t+c769IU/sr
ys1wVAUuJdcFyjaELu7ZhzFMU/2kgTlNJnACl/KcpqjYCM5wDs3EMEQda2Te6AR6cAoxHv+VvT7G
o8AUDnG+m6bBEfyLAEjVS0dGMIBzOJKCHGNoIxjCAWqPs2dwASPoploMMmmCRz7VcP0UzuXR9GeZ
JRU+giPoSV0SSGCEgz0YKr/AECZwlsJdSZ2mGeZBX5E5NcTVXSlGDIe/arVOrYXF+qWNVRXt4v9d
WUtpJRCVbHlYI0S8IxLjHKaSMoYpUcl1PpP3Kgl3NkMivhJ29fPuK/EbWL3cNHUsyV2vE/qB7Ag7
nZZWpaxMmWZz2taelV691t5yyyiU1jbKL6prv78gKmnUIy/tDnaBsgLlCjMFNwXlshmEQXMnSg2i
EaKSP4POdh0rFu2hR7/hBR8+Bg3vI3YCbhmzLvJhqxPstIkgM497ahbZzUWWtH8jLX9WyuW0BGV3
ZUK7czSGnkvz0m8GkcaoQ9vam/KTQmldK5VMjWnPNEQsb77MRbQF1RellIay3KnNPPL6TsOfDZaC
5uaXkr/lR/XmkrCQZe+9SngmO2xuGzwnOJ7JDql3pbyxWnm++mS9vBgTLzBTYZZgtjCth0yPjMvZ
iSC0ngs9432+tr5erlS/B2vfFezaNgpqZwWlLLfc7J8oN+4qzBXUFjp9pHJ7rxJ3Dpy7NAfcXcyE
tY2NcqVavomtU4U5glLBHrRLXPvL5ADlLsvF/WEOLJLeOwcYnasq3c7RktFFLfOzlCucYpZy9pBa
zqj3VGIsXheOadEltTV7P2ry9ahVqTF/f8hYVl/fiMMqcEfhXDAmDPsh40BfqLyepbcda2k7M8pU
x/5c8dtXvWy18uS3RVYbNWe60G1hsIUuXPHbt25a0jayGXPKOpTmsBna212/VFh9ugSJmtgJmCmo
cQMAdy2T5mnq3sy6dwwjTxrzFudoF7iB1xalglqPcY7WHKxjud/LwjCbhtYt8J0CZQrWkiu48eD4
agbcZj8BPmOuvl7NY9Zp+ui6Ex/aXbykHMd1zJxcsG8npq7QNBfsxxTTdaxczB9JN0d4L+my16Tj
urll5N5KOm4qeOs8snSuu/yJZMxfj0ulmxE695Nub2/vfwAAAP//AwA64WwYuhAAAA==
headers:
Access-Control-Allow-Credentials: ['true']
Access-Control-Allow-Headers: ['Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With']
Access-Control-Allow-Methods: ['GET, POST']
Access-Control-Allow-Origin: ['*']
CF-RAY: [4d3a674109b1adbb-TLV]
Connection: [keep-alive]
Content-Encoding: [gzip]
Content-Type: [application/json]
Date: ['Fri, 01 Dec 2017 12:30:16 GMT']
Server: [nginx/1.12.0]
Date: ['Wed, 08 May 2019 09:28:24 GMT']
ETag: [W/"5cd29fc3-10ba"]
Last-Modified: ['Wed, 08 May 2019 09:22:11 GMT']
Server: [cloudflare]
Set-Cookie: ['__cfduid=d8e96607cec174c1e2650d419a70786751557307704; expires=Thu,
07-May-20 09:28:24 GMT; path=/; domain=.wizdom.xyz; HttpOnly']
status: {code: 200, message: OK}
version: 1

0 comments on commit d291a84

Please sign in to comment.