Changeset 5194b5a76f8bf7294f69b55754bc847b6427aeaf

Timestamp:

10/18/09 21:49:03 (3 years ago)

Author:

Flupke <luper.rouch@…>

Children:

51bab5c0845a67636db84196cfce95dfa0cbab93, 66119c008ae513e8f008a02af9b8c97d18fbcf15

Parents:

1149eb6005e93948d6779fae19ae09c783cbc897

git-committer:

Flupke <luper.rouch@…> (10/18/09 21:49:03)

Message:

boxsort: support for tab separated input files

Location:

boxsort

Files:

• boxsort/__init__.py (modified) (5 diffs)
• tests/reppos-tab.txt (added)

boxsort/boxsort/__init__.py

@@ -30 +30 @@
 
 
-box_line_pattern = re.compile(
-        "^([A-Z]) +"            # module
-        "([0-9]{2}) +"          # deck
-        "([0-9]{2} [0-9]{2})"   # size
-        "(.{42}) +"             # name
-        "([0-9]{2}/[0-9]{2}) +" # qty
-        "(.+)$"                 # code
-    )
+# Format constants
+spaces_format = 0
+tabs_format = 1
+
+# Formats headers
+format_headers = [
+        # spaces_format
+        "REPORT TOPOGRAPHICAL",
+        # tabs_format
+        "MODULO PIANO   INIZIO  FINE    ARTICOLO        CODICE",
+    ]
+
+# Number of lines to skip after header line
+skip_lines = [        
+        3,                          # spaces_format        
+        0,                          # tabs_format
+    ]
+
+# Lines patterns
+box_line_patterns = [
+        # spaces_format
+        re.compile(
+            "^(?P<module>[A-Z]) +"
+            "(?P<deck>[0-9]{2}) +"
+            "(?P<p1>[0-9]{2}) "
+            "(?P<p2>[0-9]{2})"
+            "(?P<name>.{42}) +"
+            "(?P<qty>[0-9]{2}/[0-9]{2}) +"
+            "(?P<code>.+)$"
+        ),
+        # tabs_format
+        re.compile(
+            "^(?P<module>[A-Z])\t"
+            "(?P<deck>[0-9]+)\t"
+            "(?P<p1>[0-9]+)\t"
+            "(?P<p2>[0-9]+)\t"
+            "(?P<name>.+)\t"
+            "(?P<code>.+)$"
+        ),
+    ]
+
 module_letters = [chr(ord("A") + i) for i in range(26)]
 
@@ -46 +79 @@
     """
 
-    def __init__(self, module, deck, size, name, qty, code):
+    def __init__(self, module, deck, p1, p2, name, code, qty=None,
+            format=spaces_format):
         self.module = module
         self.deck = int(deck)
-        self.p1, self.p2 = [int(x) for x in size.split(" ")]
+        self.p1 = int(p1)
+        self.p2 = int(p2)
         self.name = name.strip()
         self.qty = qty
         self.code = code
+        self.format = format
 
     @property
@@ -64 +100 @@
 
     def __repr__(self):
-        return "%(module)s  " \
-                "%(deck)02i   " \
-                "%(p1)02i %(p2)02i" \
-                "%(name)42s  " \
-                "%(qty)s    " \
-                "%(code)s" % self.__dict__
+        if self.format == spaces_format:
+            return "%(module)s  " \
+                    "%(deck)02i   " \
+                    "%(p1)02i %(p2)02i" \
+                    "%(name)42s  " \
+                    "%(qty)s    " \
+                    "%(code)s" % self.__dict__
+        elif self.format == tabs_format:
+            return "%(module)s\t" \
+                    "%(deck)i\t" \
+                    "%(p1)i\t%(p2)i\t" \
+                    "%(name)s\t" \
+                    "%(code)s\t" % self.__dict__
 
 
@@ -162 +205 @@
 
 
-def parse(infile, prefix_size=4):
+def parse(infile):
     """
     Parse a file, returning the file prefix and the raw decks lists.
     """
-    # Read prefix
-    prefix = ""
-    for i in range(prefix_size):
+    # Detect format
+    prefix = infile.readline()
+    current_line = 1
+    for format, header in enumerate(format_headers):
+        if prefix.startswith(header):
+            break
+    else:
+        raise InvalidInputError(u"format de fichier non reconnu")
+    for i in range(skip_lines[format]):
         prefix += infile.readline()
+        current_line += 1
     # Parse decks
     decks = []
     current_deck = []
-    current_line = 4
     for line in infile:
         line = line.strip()
@@ -180 +229 @@
                 # EOF
                 break
-            match = box_line_pattern.match(line)
+            match = box_line_patterns[format].match(line)
             if not match:
                 raise InvalidInputError(u"erreur à la ligne %d: format "
                         u"invalide." % current_line)
-            current_deck.append(Box(*match.groups()))        
+            current_deck.append(Box(format=format, **match.groupdict()))
         else:
             # Empty line, starting new deck