Fixed dump -f image type handling by extension

dtmilano · dtmilano · commit d6f7f52697b0 · 2016-09-04T01:52:04.000-04:00
- Fixed `culebra` device art string when None
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '11.5.11'
+__version__ = '11.5.12'
 
 import re
 import sys
@@ -657,7 +657,9 @@ def printTakeSnapshot(filename, _format, deviceart, dropshadow, screenglare):
         warnings.warn('Multi-device not implemented yet for this case')
     else:
         logAction(u'taking snapshot @ %s format=%s %s %s %s' % (filename, _format, deviceart, dropshadow, screenglare))
-        print '%s%svc.writeImageToFile(\'%s\', \'%s\', \'%s\', %s, %s)' % (indent, prefix, filename, _format, deviceart, dropshadow, screenglare)
+        if deviceart:
+            deviceart = '\'%s\'' % deviceart
+        print '%s%svc.writeImageToFile(\'%s\', \'%s\', %s, %s, %s)' % (indent, prefix, filename, _format, deviceart, dropshadow, screenglare)
         
     
 def traverseAndPrint(view):
@@ -967,11 +969,13 @@ def printLogAction(action, priority='D'):
         print u'%s[_d.Log.%s(TAG, "%s", _v) for _d in %sallDevices()]' % (indent, priority.lower(), action, prefix)
     else:
         print '%s%sdevice.Log.%s(TAG, "%s",  _v)' % (indent, prefix, priority.lower(), action)
-    
+
+
 def logAction(action):
     if options[CulebraOptions.LOG_ACTIONS]:
         printLogAction(action)
-    
+
+
 def runCulebron():
     Culebron.checkSupportedSdkVersion(device.getSdkVersion())
     Culebron.checkDependencies()
@@ -982,7 +986,8 @@ def runCulebron():
         culebron.screenGlare = options[CulebraOptions.SCREEN_GLARE]
     culebron.takeScreenshotAndShowItOnWindow()
     culebron.mainloop()
-    
+
+
 def printShortcutVariables():
     if options[CulebraOptions.UNIT_TEST_CLASS] or options[CulebraOptions.UNIT_TEST_METHOD]:
         print '''\
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '11.5.11'
+__version__ = '11.5.12'
 
 import sys
 import os
@@ -193,7 +193,11 @@ if options[DO_NOT_DUMP_VIEWS]:
 vc = ViewClient(*ViewClient.connectToDeviceOrExit(**kwargs1), **kwargs2)
 if options[SAVE_SCREENSHOT]:
     vc.device.reconnect = True #(not options[DO_NOT_DUMP_VIEWS])
-    vc.writeImageToFile(options[SAVE_SCREENSHOT], deviceart=options[DEVICE_ART], dropshadow=options[DROP_SHADOW], screenglare=options[SCREEN_GLARE])
+    ext = os.path.splitext(options[SAVE_SCREENSHOT])[1][1:].upper()
+    _format = ext
+    if ext == 'JPG':
+        _format = 'JPEG'
+    vc.writeImageToFile(options[SAVE_SCREENSHOT], _format=_format, deviceart=options[DEVICE_ART], dropshadow=options[DROP_SHADOW], screenglare=options[SCREEN_GLARE])
 if not options[DO_NOT_DUMP_VIEWS] or options[SAVE_VIEW_SCREENSHOTS]:
     vc.dump(window=options[WINDOW])
     ViewClient.imageDirectory = options[SAVE_VIEW_SCREENSHOTS]
