Merge lp:~ech1965/rapid/fix-754531 into lp:rapid/0.0.4

[Ech]

Fix for bug #754531 : Correctly format shutter_count for Canon 400D and add formatting option to extract the DCIM directory Name from the shutter count

Fix for Bug #754531
See bug thread for more info about the changes

[Damon Lynch (dlynch3)]

Thank you for your work. The code has some errors but I'll clean them up.

review: Approve

=== modified file 'rapid/generatename.py'
--- rapid/generatename.py	2011-05-20 01:26:59 +0000
+++ rapid/generatename.py	2011-10-06 19:03:23 +0000
@@ -191,12 +191,19 @@
             v = self.rpd_file.metadata.camera_serial()
         elif self.L1 == SHUTTER_COUNT:
             v = self.rpd_file.metadata.shutter_count()
-            if v:
-                v = int(v)
-                padding = LIST_SHUTTER_COUNT_L2.index(self.L2) + 3
-                formatter = '%0' + str(padding) + "i"
-                v = formatter % v
-            
+            if self.L2 in  [ SUBFOLDER_SEQ_NUMBER, STORED_SEQ_NUMBER ] :
+                if self.L2 ==  SUBFOLDER_SEQ_NUMBER :
+                    v = str(v)
+                    v = v[:-4] 
+                if self.L2 == STORED_SEQ_NUMBER :
+                    v = str(v)
+                    v = v[-4:]
+            else:
+                if v:
+                    v = int(v)
+                    padding = LIST_SHUTTER_COUNT_L2.index(self.L2) + 3
+                    formatter = '%0' + str(padding) + "i"
+                    v = formatter % v
         elif self.L1 == OWNER_NAME:
             v = self.rpd_file.metadata.owner_name()
         elif self.L1 == ARTIST:

=== modified file 'rapid/generatenameconfig.py'
--- rapid/generatenameconfig.py	2011-05-19 05:02:37 +0000
+++ rapid/generatenameconfig.py	2011-10-06 19:03:23 +0000
@@ -311,6 +311,8 @@
                      SEQUENCE_NUMBER_4, 
                      SEQUENCE_NUMBER_5, 
                      SEQUENCE_NUMBER_6,                      
+                     SUBFOLDER_SEQ_NUMBER,
+                     STORED_SEQ_NUMBER, 
                      ]
 
 # Level 1

=== modified file 'rapid/metadataphoto.py' (properties changed: +x to -x)
--- rapid/metadataphoto.py	2011-05-19 05:02:37 +0000
+++ rapid/metadataphoto.py	2011-10-06 19:03:23 +0000
@@ -201,6 +201,16 @@
             keys = self.exif_keys
             if 'Exif.Nikon3.ShutterCount' in keys:
                 v = self['Exif.Nikon3.ShutterCount'].raw_value
+            elif 'Exif.CanonFi.FileNumber' in keys:
+                if self["Exif.Image.Model"].value.strip() == "Canon EOS 400D DIGITAL":
+                    v = self['Exif.CanonFi.FileNumber'].raw_value
+                    v = int(v)
+                    d = (v & 0xffc00) >> 10
+                    while d < 100:
+                      d += 0x40
+                    v =  d*10000 + ((v & 0x3ff ) << 4 ) + ((v >> 20) & 0x0f)
+                else:
+                    v = self['Exif.CanonFi.FileNumber'].raw_value
             elif 'Exif.Canon.FileNumber' in keys:
                 v = self['Exif.Canon.FileNumber'].raw_value
             elif 'Exif.Canon.ImageNumber' in keys: