module structure ready. you can now safely import Qalbum

Qalbum-descriptor.py

@@ -16,37 +16,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys,os
-import re
-import shutil
 import subprocess
-from optparse import OptionParser 
-from math import ceil
+from argparse import ArgumentParser 
+import Qalbum
 
 # (c) ville.rantanen@helsinki.fi
 
-imagesearch=re.compile('.*\.jpg$|.*\.jpeg$|.*\.gif$|.*\.png$|.*\.svg$|.*\.pdf$',re.I)
-excludepaths=re.compile('_med|_tn|\..*')
 DESCFILE='descriptions.csv'
 
-def getimagelist(path):
-    ''' Returns a list of images matching the regex '''
-    list=os.listdir(path)
-    imgs=[]
-    for f in list:
-        if (imagesearch.match(os.path.join(path,f))) and (os.path.isfile(os.path.join(path,f))):
-            imgs.append(f)
-    return imgs
-    
-def getpathlist(path):
-    ''' Returns a list of subfolders not matching the exclusion regex '''
-    list=os.listdir(path)
-    paths=[]
-    for d in list:
-        if (not excludepaths.match(d)) and (os.path.isdir(os.path.join(path,d))):
-            paths.append(d)
-    return paths
-
-def createdesc(path,list):
+def createdesc(path,list,options):
     ''' Runs imagemagick identify to create descriptions of images '''
     if len(list)==0:
         return
@@ -74,42 +52,43 @@ def create_description(infile,format):
     output = idp.stdout.read()
     return output
 
-def traverse(path):
+def traverse(path,options):
     ''' The recursive main function to create the thumbs and seek sub folders '''
     print(path)
-    pathlist=getpathlist(path)
-    imagelist=getimagelist(path)
+    pathlist=Qalbum.getpathlist(path,options)
+    imagelist=Qalbum.getimagelist(path,options)
     print(str(len(pathlist))+' paths')
     print(str(len(imagelist))+' images')
-    createdesc(path,imagelist)
+    createdesc(path,imagelist,options)
     if options.recursive:
         for p in pathlist:
-            traverse(os.path.join(path,p))
+            traverse(os.path.join(path,p),options)
     return
 
 def execute():
     ''' Main execution '''
-    usage='''Usage: %prog [options] folder
-folder is the root folder of the image album.'''
-    parser=OptionParser(usage=usage)
-    parser.add_option("-f",action="store_true",dest="force",default=False,
+    parser=ArgumentParser(version=Qalbum.__version__)
+    parser.add_argument("-f",action="store_true",dest="force",default=False,
                       help="Force rewriting of descriptions")
-    parser.add_option("--format",type="str",dest="format",default="",
+    parser.add_argument("--format",type=str,dest="format",default="",
                       help="""Formatting string, see: http://www.imagemagick.org/script/escape.php. 
     Setting this option will override the presets""")
-    parser.add_option("-r",action="store_true",dest="recursive",default=False,
+    parser.add_argument("-r",action="store_true",dest="recursive",default=False,
                       help="Recurse in to subfolders")
-    parser.add_option("-p",type="int",dest="preset",default=1,
+    parser.add_argument("-p",type=int,dest="preset",default=1,
                       help="presets for descriptions. \"-p 0\" to get the list")
-    global options
-    (options,args)=parser.parse_args()
-    if len(args) != 1 and options.preset!=0:
-        parser.error("incorrect number of arguments")
+    parser.add_argument("startpath",type=str,action="store",default=os.path.abspath('.'),nargs='?',
+                      help="Start path for recursion")
+    options=parser.parse_args()
+    options.startpath=os.path.abspath(options.startpath)
+    options=Qalbum.setupdefaultoptions(options)
+
     presets=[
         '%f: %[EXIF:DateTimeOriginal]',
         '%f: %wx%h %[size]',
         '%f<br/><i>%[EXIF:DateTimeOriginal] %[EXIF:ExposureTime]s F%[EXIF:FNumber]</i>']
     if options.preset<1:
+        print "Presets:"
         for row in range(len(presets)):
             print row+1," ",presets[row]
         sys.exit(0)
@@ -118,7 +97,7 @@ folder is the root folder of the image album.'''
             parse.error("No such preset")
         options.format=presets[options.preset-1]
     
-    traverse(os.path.abspath(args[0]))
+    traverse(options.startpath,options)
     return
 
 execute()