From 048b7747d426df05004d58479f2b4d24c6d37451 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 26 Jan 2010 12:08:30 +0000
Subject: [PATCH] Fixed regex errors.

---
 tvorganise.cfg | 20 ++++++++++++++------
 tvorganise.py  |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tvorganise.cfg b/tvorganise.cfg
index cc567d6..d6e2333 100644
--- a/tvorganise.cfg
+++ b/tvorganise.cfg
@@ -1,12 +1,20 @@
 [main]
-
 # Target directory
 target_path: /mnt/vault/video/TV Shows/%(file_showname)s/Season %(seasno)s/
 
 [regex]
+# Replacement strings used within regexs.
 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+)$"
-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+)$"
+
+# File format identification regex
+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+)$
+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})\]
+
diff --git a/tvorganise.py b/tvorganise.py
index dfb9ea2..740c16f 100755
--- a/tvorganise.py
+++ b/tvorganise.py
@@ -34,6 +34,7 @@ if configpsr.has_section('regex'):
 
     for k, v in configpsr.items('regex'):
         if k[:5] == 'regex':
+            print v % regex_config
             regex.append(re.compile(v % regex_config))
 
     config['regex'] = regex
@@ -59,7 +60,7 @@ def findFiles(args):
 
 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 = []
     for f in names:
@@ -122,7 +123,6 @@ def same_partition(f1, f2):
 
 ###########################
 
-
 def main():
     parser = OptionParser(usage="%prog [options] <file or directories>")
     parser.add_option("-a", "--always", dest = "always",