Generate screen dumps which include device art options

dtmilano · dtmilano · commit a3de4e77ecd1 · 2017-09-23T13:18:37.000-04:00
- Show warning when webp device art is found
diff --git a/.idea/runConfigurations/dump__D__A_auto__ZB__f__tmp_f1_png.xml b/.idea/runConfigurations/dump__D__A_auto__ZB__f__tmp_f1_png.xml
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '13.4.1'
+__version__ = '13.5.0'
 
 import sys
 import warnings
@@ -4054,6 +4054,8 @@ def writeImageToFile(self, filename, _format="PNG", deviceart=None, dropshadow=T
                         screenGlareImage = Image.open(deviceArtModelDir + '/%s%sfore.png' % (orientationName, separator))
                         deviceBack.paste(screenGlareImage, (0, 0), screenGlareImage)
                     image = deviceBack
+                except IOError as ex:
+                    warnings.warn("ViewClient.writeImageToFile: Some new devices have webp art which is still not supported by ViewClient")
                 except ImportError as ex:
                     self.pilNotInstalledWarning()
             else:
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '13.4.1'
+__version__ = '13.5.0'
 
 import calendar
 import codecs
@@ -1243,8 +1243,8 @@ class CulebraTests(CulebraTestCase):
     
     if options[CulebraOptions.SAVE_SCREENSHOT]:
         print '''\
-        self.vc.writeImageToFile('%s')
-        ''' % options[CulebraOptions.SAVE_SCREENSHOT]
+        self.vc.writeImageToFile('%s', 'PNG', %s, %s, %s)
+        ''' % (options[CulebraOptions.SAVE_SCREENSHOT], options[CulebraOptions.DEVICE_ART], options[CulebraOptions.DROP_SHADOW], options[CulebraOptions.SCREEN_GLARE])
     
     if options[CulebraOptions.USE_DICTIONARY]:
         print '''\
@@ -1301,8 +1301,8 @@ vc = ViewClient(device, serialno, **kwargs2)
 
         if options[CulebraOptions.SAVE_SCREENSHOT]:
             print '''\
-vc.writeImageToFile('%s')
-''' % options[CulebraOptions.SAVE_SCREENSHOT]
+vc.writeImageToFile('%s', 'PNG', %s, %s, %s)
+''' % (options[CulebraOptions.SAVE_SCREENSHOT], options[CulebraOptions.DEVICE_ART], options[CulebraOptions.DROP_SHADOW], options[CulebraOptions.SCREEN_GLARE])
 
     if vc:
         vc.dump(window=options[CulebraOptions.WINDOW])
