dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better year name guessing. #2323

Browse Source
This commit is contained in:
Ruud
2013-10-09 16:36:13 +02:00
parent 75bda46f64
commit a46241bb9f
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/scanner/main.py
+16 -12
View File
@@ -830,19 +830,21 @@ class Scanner(Plugin):
def findYear(self, text): def findYear(self, text):
# Search year inside () or [] first # Search year inside () or [] first
matches = re.search('(\(|\[)(?P<year>19[0-9]{2}|20[0-9]{2})(\]|\))', text) matches = re.findall('(\(|\[)(?P<year>19[0-9]{2}|20[0-9]{2})(\]|\))', text)
if matches: if matches:
return matches.group('year') return matches[-1][1]
# Search normal # Search normal
matches = re.search('(?P<year>19[0-9]{2}|20[0-9]{2})', text) matches = re.findall('(?P<year>19[0-9]{2}|20[0-9]{2})', text)
if matches: if matches:
return matches.group('year') return matches[-1]
return '' return ''
def getReleaseNameYear(self, release_name, file_name = None): def getReleaseNameYear(self, release_name, file_name = None):
release_name = release_name.strip(' .-_')
# Use guessit first # Use guessit first
guess = {} guess = {}
if file_name: if file_name:
@@ -860,7 +862,7 @@ class Scanner(Plugin):
cleaned = ' '.join(re.split('\W+', simplifyString(release_name))) cleaned = ' '.join(re.split('\W+', simplifyString(release_name)))
cleaned = re.sub(self.clean, ' ', cleaned) cleaned = re.sub(self.clean, ' ', cleaned)
for year_str in [file_name, cleaned]: for year_str in [file_name, release_name, cleaned]:
if not year_str: continue if not year_str: continue
year = self.findYear(year_str) year = self.findYear(year_str)
if year: if year:
@@ -870,19 +872,21 @@ class Scanner(Plugin):
if year: # Split name on year if year: # Split name on year
try: try:
movie_name = cleaned.split(year).pop(0).strip() movie_name = cleaned.rsplit(year, 1).pop(0).strip()
cp_guess = { if movie_name:
'name': movie_name, cp_guess = {
'year': int(year), 'name': movie_name,
} 'year': int(year),
}
except: except:
pass pass
else: # Split name on multiple spaces
if not cp_guess: # Split name on multiple spaces
try: try:
movie_name = cleaned.split(' ').pop(0).strip() movie_name = cleaned.split(' ').pop(0).strip()
cp_guess = { cp_guess = {
'name': movie_name, 'name': movie_name,
'year': int(year), 'year': int(year) if movie_name[:4] != year else 0,
} }
except: except:
pass pass