|
|
@@ -65,10 +65,14 @@ for file in dirfiles:
|
|
|
f = {}
|
|
|
f['file'] = file
|
|
|
try:
|
|
|
- split = os.path.splitext(file)
|
|
|
- f['base'] = split[0]
|
|
|
- f['extension'] = split[1]
|
|
|
- se = re.search('S(\\d+)E(\\d+)', file, flags=re.IGNORECASE)
|
|
|
+ split = re.search(r'^(.+?)(\.(?:\w\w\.)?(?:sdh\.)?\w{3,4})$', file, re.IGNORECASE)
|
|
|
+ if split is not None:
|
|
|
+ f['base'] = split.group(1)
|
|
|
+ f['extension'] = split.group(2)
|
|
|
+ else:
|
|
|
+ f['base'] = file
|
|
|
+ f['extension'] = ''
|
|
|
+ se = re.search(r'S(\d+)E(\d+)', file, flags=re.IGNORECASE)
|
|
|
if se is None:
|
|
|
# Does not contain a season/episode block
|
|
|
continue
|