movie.py: deal with special chars that cause problems in afp/smb (?<>)

This commit is contained in:
rolux 2012-09-11 19:21:45 +02:00
parent 16d16b0c45
commit 2879c66d46

View file

@ -36,7 +36,7 @@ The Title[ ([SXX][EYY[+ZZ|-ZZ]])[ Episode Title]][.Version][.Part XY[.Part Title
def format_path(data, directory_key='director'): def format_path(data, directory_key='director'):
def format_underscores(string): def format_underscores(string):
return re.sub('^\.|\.$|/|:', '_', string) return = re.sub('^\.|\.$|:|/|\?|<|>', '_', string)
is_episode = data['episode'] != None or data['season'] != None is_episode = data['episode'] != None or data['season'] != None
director = data['directorSort'] or ['Unknown Director'] director = data['directorSort'] or ['Unknown Director']
title = data['seriesTitle' if data['isEpisode'] else 'title'] or 'Untitled' title = data['seriesTitle' if data['isEpisode'] else 'title'] or 'Untitled'
@ -203,6 +203,7 @@ def parse_path(path, directory_key='director'):
def parse_underscores(string): def parse_underscores(string):
string = re.sub('^_', '.', string) string = re.sub('^_', '.', string)
string = re.sub('_$', '.', string) string = re.sub('_$', '.', string)
string = re.sub('(?<= )_(.+)_(?= )', '<\g<1>>', string)
string = re.sub('(?<=\w)_(?=\w)', '/', string) string = re.sub('(?<=\w)_(?=\w)', '/', string)
string = re.sub(' _ ', ' / ', string) string = re.sub(' _ ', ' / ', string)
string = re.sub('(?<=\w)_ ', ': ', string) string = re.sub('(?<=\w)_ ', ': ', string)