nikdoof/tvorganise
1
0
Fork 0
mirror of https://github.com/nikdoof/tvorganise.git synced 2025-12-13 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regex errors.

Browse Source
This commit is contained in:
Andrew Williams
2010-01-26 12:08:30 +00:00
parent 1041accd0d
commit 048b7747d4
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tvorganise.cfg
View File

@@ -1,12 +1,20 @@
[main] [main]
# Target directory # Target directory
target_path: /mnt/vault/video/TV Shows/%(file_showname)s/Season %(seasno)s/ target_path: /mnt/vault/video/TV Shows/%(file_showname)s/Season %(seasno)s/
[regex] [regex]
# Replacement strings used within regexs.
valid_in_names: [\w\(\).,\[\]'\ \-?!#:] valid_in_names: [\w\(\).,\[\]'\ \-?!#:]
regex1: "^(%(valid_in_names)s+) - \[(\d{2})x(\d{2})\] - (%(valid_in_names)s+)$"
regex2: "^(%(valid_in_names)s+) - \[(\d{2})x(\d{2}-\d{2})\] - (%(valid_in_names)s+)$" # File format identification regex
regex3: "^(%(valid_in_names)s+) - \[(\d{2})x(Special\d{1,2})\] - (%(valid_in_names)s+)$" regex1: ^(%(valid_in_names)s+) - \[(\d{2})x(\d{2})\] - (%(valid_in_names)s+)$
regex4: "^(%(valid_in_names)s+) - \[(\d{2})xExtra(\d{1,2})\] - (%(valid_in_names)s+)$" regex2: ^(%(valid_in_names)s+) - \[(\d{2})x(\d{2}-\d{2})\] - (%(valid_in_names)s+)$
regex5: "^(%(valid_in_names)s+) - \[(\d{2})] - (%(valid_in_names)s+)$" regex3: ^(%(valid_in_names)s+) - \[(\d{2})x(Special\d{1,2})\] - (%(valid_in_names)s+)$
regex4: ^(%(valid_in_names)s+) - \[(\d{2})xExtra(\d{1,2})\] - (%(valid_in_names)s+)$
regex5: ^(%(valid_in_names)s+) - \[(\d{2})] - (%(valid_in_names)s+)$
regex6: (%(valid_in_names)s+) - \[(\d{2})x(\d{2})\]
regex7: (%(valid_in_names)s+) - \[(\d{2})x(\d{2}-\d{2})\]
regex8: (%(valid_in_names)s+) - \[(\d{2})x(Special\d{1,2})\]
regex9: (%(valid_in_names)s+) - \[(\d{2})x(Extra\d{1,2})\]
regex10: (%(valid_in_names)s+) - \[(\d{2})x(Extra\d{1,2})\]

4
tvorganise.py
View File

@@ -34,6 +34,7 @@ if configpsr.has_section('regex'):
for k, v in configpsr.items('regex'): for k, v in configpsr.items('regex'):
if k[:5] == 'regex': if k[:5] == 'regex':
print v % regex_config
regex.append(re.compile(v % regex_config)) regex.append(re.compile(v % regex_config))
config['regex'] = regex config['regex'] = regex
@@ -59,7 +60,7 @@ def findFiles(args):
def processNames(names, verbose=False): def processNames(names, verbose=False):
""" """
Takes list of names, runs them though the tv_regex['with_ep_name'] regexs Takes list of names, runs them though the regexs
""" """
allEps = [] allEps = []
for f in names: for f in names:
@@ -122,7 +123,6 @@ def same_partition(f1, f2):
########################### ###########################
def main(): def main():
parser = OptionParser(usage="%prog [options] <file or directories>") parser = OptionParser(usage="%prog [options] <file or directories>")
parser.add_option("-a", "--always", dest = "always", parser.add_option("-a", "--always", dest = "always",