From fb170c52a9d4bd13bededbc8be7881b2fa2dfdc0 Mon Sep 17 00:00:00 2001
From: nanotube <nanotube>
Date: Fri, 4 Apr 2008 04:25:26 +0000
Subject: [PATCH] - add microseconds to image filenames, since there can be
 multiple clicks in one second, and we don't want to clobber existing image
 files. - update testing code so that it works (add new image format options
 into testing settings, change argument order)

---
 imagecapture.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/imagecapture.py b/imagecapture.py
index 99f6bf4..146e58f 100644
--- a/imagecapture.py
+++ b/imagecapture.py
@@ -21,6 +21,7 @@
 ##############################################################################
 
 import time
+import datetime
 import threading
 import Image
 import Queue
@@ -136,7 +137,7 @@ class ImageWriter(threading.Thread):
         self.PrintDebug(cropbox)
         
         #savefilename = os.path.join(self.imagedir, "click_" + time.strftime('%Y%m%d_%H%M%S') + "_" + self.filter.sub(r'__', self.getProcessName(event)) + ".png")
-        savefilename = os.path.join(self.imagedir, "click_" + time.strftime('%Y%m%d_%H%M%S') + "_" + self.filter.sub(r'__', self.getProcessName(event)) + "." + self.settings['Image Capture']['Capture Clicks Image Format'])
+        savefilename = os.path.join(self.imagedir, "click_" + datetime.datetime.today().strftime('%Y%m%d_%H%M%S_') + str(datetime.datetime.today().microsecond) + "_" + self.filter.sub(r'__', self.getProcessName(event)) + "." + self.settings['Image Capture']['Capture Clicks Image Format'])
         
         if os.name == 'posix':
             
@@ -277,9 +278,9 @@ if __name__ == '__main__':
     settings['Log Maintenance'] = {'Delete Old Logs':False,'Flush Interval':1000,'Log Rotation Interval':4,'Delete Old Logs':False}
     settings['Zip'] = {'Zip Enable':False}
     settings['General'] = {'Log Directory':'logs','System Log':'None','Log Key Count':True}
-    settings['Image Capture'] = {'Capture Clicks Width':300,'Capture Clicks Height':300}
+    settings['Image Capture'] = {'Capture Clicks Width':300,'Capture Clicks Height':300, 'Capture Clicks Image Format':'png', 'Capture Clicks Image Quality': 75}
         
-    iw = ImageWriter(cmdoptions, settings, q)
+    iw = ImageWriter(settings, cmdoptions, q)
     iw.start()
     q.put(event)
     time.sleep(5)
-- 
2.45.1