Skip to content

Commit fff8e18

Browse files
authored
Fixing episode and season search bug
1 parent 9a44eeb commit fff8e18

File tree

1 file changed

+62
-19
lines changed

1 file changed

+62
-19
lines changed

Script.py

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -257,20 +257,47 @@ def similarity(a, b):
257257
if not selected_dir and dirname_list:
258258
selected_dir.append(random.choice(dirname_list))
259259

260-
261-
season_patterns = [
262-
f'Season{Season}', f'SEASON 0{Season}', f'season 0{Season}',
263-
f'S0{Season}', f's0{Season}', f'S{Season}', f's{Season}',
264-
f'Season.0{Season}', f'SEASON.0{Season}', f'Season.{Season}',
265-
f'SEASON.{Season}', f'Season-0{Season}', f'SEASON-0{Season}',
266-
f'Season {Season}', f'SEASON {Season}', f'season {Season}',
267-
f'Season-{Season}', f'SEASON-{Season}', f'season-{Season}',
268-
f'Season_{Season}', f'SEASON_{Season}', f'season_{Season}',
269-
f'Season[0{Season}]', f'SEASON[0{Season}]', f'season[0{Season}]',
270-
f'Season 0{Season}', f'SEASON 0{Season}', f'season 0{Season}',
271-
f'Season-0{Season}', f'SEASON-0{Season}', f'season-0{Season}'
260+
Season = str(Season)
261+
if len(Season) == 1:
262+
season_patterns = [
263+
f'Season0{Season}', f'SEASON 0{Season}', f'season 0{Season}',
264+
f'S0{Season}', f's0{Season}', f'S0{Season}', f's0{Season}',
265+
f'Season.0{Season}', f'SEASON.0{Season}', f'Season.0{Season}',
266+
f'SEASON.0{Season}', f'Season-0{Season}', f'SEASON-0{Season}',
267+
f'Season 0{Season}', f'SEASON 0{Season}', f'season 0{Season}',
268+
f'Season-0{Season}', f'SEASON-0{Season}', f'season-0{Season}',
269+
f'Season_0{Season}', f'SEASON_0{Season}', f'season_0{Season}',
270+
f'Season[0{Season}]', f'SEASON[0{Season}]', f'season[0{Season}]',
271+
f'Season 0{Season}', f'SEASON 0{Season}', f'season 0{Season}',
272+
f'Season-0{Season}', f'SEASON-0{Season}', f'season-0{Season}'
272273
]
273-
274+
if len(Season) == 2 and Season[0] == '0':
275+
season_patterns = [
276+
f'Season{Season}', f'SEASON {Season}', f'season {Season}',
277+
f'S{Season}', f's{Season}', f'S{Season}', f's{Season}',
278+
f'Season.{Season}', f'SEASON.{Season}', f'Season.{Season}',
279+
f'SEASON.{Season}', f'Season-{Season}', f'SEASON-{Season}',
280+
f'Season {Season}', f'SEASON {Season}', f'season {Season}',
281+
f'Season-{Season}', f'SEASON-{Season}', f'season-{Season}',
282+
f'Season_{Season}', f'SEASON_{Season}', f'season_{Season}',
283+
f'Season[{Season}]', f'SEASON[{Season}]', f'season[{Season}]',
284+
f'Season {Season}', f'SEASON {Season}', f'season {Season}',
285+
f'Season-{Season}', f'SEASON-{Season}', f'season-{Season}'
286+
]
287+
if len(Season) == 2 and Season[0] != '0':
288+
season_patterns = [
289+
f'Season{Season}', f'SEASON {Season}', f'season {Season}',
290+
f'S{Season}', f's{Season}', f'S{Season}', f's{Season}',
291+
f'Season.{Season}', f'SEASON.{Season}', f'Season.{Season}',
292+
f'SEASON.{Season}', f'Season-{Season}', f'SEASON-{Season}',
293+
f'Season {Season}', f'SEASON {Season}', f'season {Season}',
294+
f'Season-{Season}', f'SEASON-{Season}', f'season-{Season}',
295+
f'Season_{Season}', f'SEASON_{Season}', f'season_{Season}',
296+
f'Season[{Season}]', f'SEASON[{Season}]', f'season[{Season}]',
297+
f'Season {Season}', f'SEASON {Season}', f'season {Season}',
298+
f'Season-{Season}', f'SEASON-{Season}', f'season-{Season}'
299+
]
300+
Season = int(Season)
274301
SeasonFolder = []
275302

276303
for season_pattern in season_patterns:
@@ -287,13 +314,29 @@ def similarity(a, b):
287314
seasonDir = os.path.join(root, dir)
288315
SeasonFolder.append(seasonDir)
289316
break
290-
291-
episode_patterns = [
292-
f'EPISODE 0{Episode}', f'episode 0{Episode}',
293-
f'E0{Episode}', f'e0{Episode}',
294-
f'Episode.0{Episode}', f'EPISODE.0{Episode}',
295-
f'Episode-0{Episode}', f'EPISODE-0{Episode}'
317+
Episode = str(Episode)
318+
if len(Episode) == 1:
319+
episode_patterns = [
320+
f'EPISODE 0{Episode}', f'episode 0{Episode}',
321+
f'E0{Episode}', f'e0{Episode}',
322+
f'Episode.{Episode}', f'EPISODE.{Episode}',
323+
f'Episode-0{Episode}', f'EPISODE-0{Episode}'
296324
]
325+
if len(Episode) == 2 and Episode[0] == '0':
326+
episode_patterns = [
327+
f'EPISODE {Episode}', f'episode {Episode}',
328+
f'E{Episode}', f'e{Episode}',
329+
f'Episode.{Episode}', f'EPISODE.{Episode}',
330+
f'Episode-{Episode}', f'EPISODE-{Episode}'
331+
]
332+
if len(Episode) == 2 and Episode[0] != '0':
333+
episode_patterns = [
334+
f'EPISODE {Episode}', f'episode {Episode}',
335+
f'E{Episode}', f'e{Episode}',
336+
f'Episode.{Episode}', f'EPISODE.{Episode}',
337+
f'Episode-{Episode}', f'EPISODE-{Episode}'
338+
]
339+
Episode = int(Episode)
297340

298341
episodePath = None
299342
matchedepisodes = []

0 commit comments

Comments
 (0)