X-Git-Url: http://gitweb.pimeys.fr/?p=scripts-20-100.git;a=blobdiff_plain;f=rename_series.py;h=efeeb5ed62440d146c9abd2ab6c456898267436c;hp=dd4e0fe773056bf80709a63700df545007cca989;hb=6b840fc4cf2bb1ca92363f65c2596454c7c81f80;hpb=d706a2361f5ddebb688e73abc6c65cd2fcfe882c

diff --git a/rename_series.py b/rename_series.py
index dd4e0fe..efeeb5e 100755
--- a/rename_series.py
+++ b/rename_series.py
@@ -12,7 +12,7 @@ import pprint
 
 FORMAT = "%%(series_name)s - [%%(season)0%(logmaxseason)sdx%%(episode)0%(logmaxepisode)sd] - %%(title)s.%%(extension)s"
 
-SEASONEPISODE_REGEXP = ur"^(?P<series_name>([A-Za-z0-9_-]+(\.| ))+)(S|\[)(?P<season>\d+)(E|x)(?P<episode>\d+).*\.(?P<extension>[a-z0-9]*)$"
+SEASONEPISODE_REGEXP = ur"^(?P<series_name>([A-Za-z0-9_()-]+(\.| ))+)(S|- \[?)(?P<season>\d+)(E|x)(?P<episode>\d+).*\.(?P<extension>[a-z0-9]*)$"
 sep_re = re.compile(SEASONEPISODE_REGEXP)
 
 def get_titles(filename, debug=False, oneintwo=False):
@@ -21,7 +21,7 @@ def get_titles(filename, debug=False, oneintwo=False):
     if oneintwo:
         # On enlève une ligne sur deux
         text = re.sub("(.*\n).*\n", r'\1', text)
-    titles = re.findall('"(.*)"', text)
+    titles = re.findall('^[0-9\s]+"(.*?)"', text, flags=re.MULTILINE)
     if debug:
         print "Titres :"
         pprint.pprint(titles)