Merge pull request #3 from achimoraites/refactor/conversion

refactor: target image format

Author: achimoraites

README.md

@@ -1,5 +1,4 @@
 # Python Image Converter
-## This application is designed to run with Python 2.7
 
 ## This is a simple Image converter written in Python
 The app is using PIL ,rawpy and imageio . 
@@ -17,27 +16,33 @@ The .ai files are renamed as .pdf and moved to the converted directory !!!
 Personally i convert a lot of .psd , .TIF and .dng files !!! 
 ## Speed
 This script is multithreaded and checks if you have already converted an image!
+
 ### Before you can use it Install :
-```
- pip install Image 
- pip install rawpy
- pip install imageio 
- 
+```python
+ pip install Pillow rawpy imageio
 ```
 ### Example usage
 
 ```
  git clone https://github.com/Cyb3rN4u7/Python-Image-Converter.git [my-app-name]
  cd [my-app-name]
  cd app
- python convert.py -s <Enter-Path-Of-Directory>
+ 
+ # simple usage
+ python convert.py --s <Enter-Path-Of-Directory>
+
+ # set a custom target image format
+ python convert.py --s <Enter-Path-Of-Directory> --ext '.png'
 ```
-* The -s argument is where you set the path to the directory you want to convert! 
+- The --s argument is where you set the path to the directory you want to convert! 
+- The --ext argument is where you specify the image format that will be used for the converted images; by default the `.jpg` is used. valid options are:
+    - `.jpg`
+    - `.png`
 
 The application will create a folder 'converted' where all your converted images are located!
 
 And you are done! 
 
 ## ScreenShot
-<img src='app/img/sample.png' alt='Python Image Converter'>
+<img src='sample.png' alt='Python Image Converter'>
 

app/convert.py

@@ -34,25 +34,15 @@ def message(file, bool):
 
 
 # convert RAW images function
-def convert_raw(file, directory, tgtDir):
+def convert_raw(file, directory, tgtDir, extension=".jpg"):
     # path = 'image.nef'
 
     try:
         message(file, False)
         path = os.path.join(tgtDir, file)
         with rawpy.imread(path) as raw:
             rgb = raw.postprocess()
-        imageio.imsave(os.path.join(directory, file + '.jpg'), rgb)
-        message(file, True)
-    except:
-        pass
-
-    try:
-        message(file, False)
-        path = os.path.join(tgtDir, file)
-        with rawpy.imread(path) as raw:
-            rgb = raw.postprocess()
-        imageio.imsave(os.path.join(directory, file + '.png'), rgb)
+        imageio.imsave(os.path.join(directory, file + extension), rgb)
         message(file, True)
     except:
         pass
@@ -119,15 +109,18 @@ def main():
 
     parser = optparse.OptionParser("usage: " + sys.argv[0] + \
                                    "\n-s <source directory> \n ex: usage%prog -s C:\\Users\\USerName\\Desktop\\Photos_Dir \n After -s Specify the directory you will convert")
-    parser.add_option('-s', dest='nname', type='string', \
+    parser.add_option('--s', dest='nname', type='string', \
                       help='specify your source directory!')
+    parser.add_option('--ext', dest='target_image_extension', type='choice', \
+                      default=".jpg", choices = ['.jpg', '.png'], help='the image format to be used for the converted images.')
     (options, args) = parser.parse_args()
     if (options.nname == None):
         print(parser.usage)
         exit(0)
     else:
         tgtDir = os.path.abspath(options.nname)
 
+
     print("Started conversion at : " + datetime.now().time().strftime('%H:%M:%S') + '\n')
     print("Converting \n -> " + tgtDir + " Directory !\n")
     # find files to convert
@@ -138,7 +131,7 @@ def main():
             if image_not_exists(file):
                 if 'RAW' == checkExtension(file):
                     # Added multithreds to complete conversion faster
-                    t2 = Thread(target=convert_raw, args=(file, directory, tgtDir))
+                    t2 = Thread(target=convert_raw, args=(file, directory, tgtDir, options.target_image_extension))
                     t2.start();
 
                 if 'NOT_RAW' == checkExtension(file):