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

Add some more double char replacements

Browse Source
This commit is contained in:
Ruud
2013-11-14 22:35:13 +01:00
parent cdb889a985
commit c1944c987d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/main.py
+8 -4
View File
@@ -748,18 +748,22 @@ Remove it if you want it to be renamed (again, or at least let it try again)
for x, r in replacements.iteritems(): for x, r in replacements.iteritems():
if x in ['thename', 'namethe']: if x in ['thename', 'namethe']:
replaced = replaced.replace(u'<%s>' % toUnicode(x), toUnicode(r)) replaced = replaced.replace(u'<%s>' % toUnicode(x), toUnicode(r))
else:
continue
replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced) replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced)
sep = self.conf('foldersep') if folder else self.conf('separator') sep = self.conf('foldersep') if folder else self.conf('separator')
return replaced.replace(' ', ' ' if not sep else sep) return replaced.replace(' ', ' ' if not sep else sep)
def replaceDoubles(self, string): def replaceDoubles(self, string):
replaces = [('\s', ' '), ('\s\.', ' '), ('\.', '.'), ('_', '_'), ('-', '-')]
replaces = [
('\.+', '.'), ('_+', '_'), ('-+', '-'), ('\s+', ' '),
('(\s\.)+', '.'), ('(-\.)+', '.'), ('(\s-)+', '-'),
]
for r in replaces: for r in replaces:
reg, replace_with = r reg, replace_with = r
string = re.sub('%s+' % reg, replace_with, string) string = re.sub(reg, replace_with, string)
return string return string
def deleteEmptyFolder(self, folder, show_error = True): def deleteEmptyFolder(self, folder, show_error = True):