0.4.1

Fix for Sierra and below given change in Apple Datetimes. Will likely also need permissions given to Library Folder.
Ghawken · Jan 21, 2019 · 785c6e9 · 785c6e9
1 parent 3a5e178
commit 785c6e9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/iMessage.indigoPlugin/Contents/Info.plist b/iMessage.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>0.4.0</string>
+	<string>0.4.1</string>
 	<key>ServerApiVersion</key>
 	<string>2.0.0</string>
 	<key>IwsApiVersion</key>

diff --git a/iMessage.indigoPlugin/Contents/Server Plugin/plugin.py b/iMessage.indigoPlugin/Contents/Server Plugin/plugin.py
@@ -21,6 +21,7 @@
 import re
 import threading
 import subprocess
+import platform
 
 try:
     import indigo
@@ -36,6 +37,7 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         self.username = str(os.getlogin())
         self.pathtoPlugin = os.getcwd()
         self.startingUp = True
+        self.systemVersion = int(platform.release()[:2])  ## take first two digits and make an int: 18-Mojave, 17 High ierra, 16 - Sierra
         self.pluginIsInitializing = True
         self.pluginIsShuttingDown = False
         self.prefsUpdated = False
@@ -47,6 +49,9 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         self.logger.info(u"{0:<30} {1}".format("Indigo version:", indigo.server.version))
         self.logger.info(u"{0:<30} {1}".format("Python version:", sys.version.replace('\n', '')))
         self.logger.info(u"{0:<30} {1}".format("Python Directory:", sys.prefix.replace('\n', '')))
+        self.logger.info(u"{0:<30} {1}".format("System Release:", platform.release() ))
+        self.logger.info(u"{0:<30} {1}".format("System Release Short:", self.systemVersion))
+        self.logger.info(u"{0:<30} {1}".format("System Version:", platform.version() ))
         self.logger.info(u"{0:=^130}".format(""))
 
         pfmt = logging.Formatter('%(asctime)s.%(msecs)03d\t[%(levelname)8s] %(name)20s.%(funcName)-25s%(msg)s',
@@ -343,11 +348,16 @@ def sql_fetchattachments(self):
         #     self.debugLog(u"fetch messages() method called.")
         cursor = self.connection.cursor()
 
-        sqlcommand = '''
-SELECT attachmentT.filename FROM message messageT INNER JOIN attachment attachmentT INNER JOIN message_attachment_join meAtJoinT ON attachmentT.ROWID= meAtJoinT.attachment_id WHERE meAtJoinT.message_id=messageT.ROWID
-AND datetime(messageT.date/1000000000 + strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-120 seconds', 'localtime');     
-                   '''
-
+        if self.systemVersion >=17:
+            sqlcommand = '''
+    SELECT attachmentT.filename FROM message messageT INNER JOIN attachment attachmentT INNER JOIN message_attachment_join meAtJoinT ON attachmentT.ROWID= meAtJoinT.attachment_id WHERE meAtJoinT.message_id=messageT.ROWID
+    AND datetime(messageT.date/1000000000 + strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-120 seconds', 'localtime');     
+                       '''
+        else:
+            sqlcommand = '''
+            SELECT attachmentT.filename FROM message messageT INNER JOIN attachment attachmentT INNER JOIN message_attachment_join meAtJoinT ON attachmentT.ROWID= meAtJoinT.attachment_id WHERE meAtJoinT.message_id=messageT.ROWID
+            AND datetime(messageT.date + strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-120 seconds', 'localtime');     
+                               '''
         cursor.execute(sqlcommand)
         result = cursor.fetchall()
 
@@ -364,14 +374,26 @@ def sql_fetchmessages(self):
        #     self.debugLog(u"fetch messages() method called.")
         cursor = self.connection.cursor()
 
-        sqlcommand = '''
-           SELECT handle.id, message.text, message.is_audio_message
-             FROM message INNER JOIN handle 
-             ON message.handle_id = handle.ROWID 
-             WHERE is_from_me=0 AND 
-             datetime(message.date/1000000000 + strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-10 seconds', 'localtime')
-             ORDER BY message.date ASC;      
-           '''
+        #below is needed for older than Mojave
+        if self.systemVersion >=17:
+            sqlcommand = '''
+              SELECT handle.id, message.text, message.is_audio_message
+                FROM message INNER JOIN handle 
+                ON message.handle_id = handle.ROWID 
+                WHERE is_from_me=0 AND 
+                datetime(message.date/1000000000 + strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-10 seconds', 'localtime')
+                ORDER BY message.date ASC;      
+              '''
+        else:
+            sqlcommand = '''
+             SELECT handle.id, message.text, message.date
+                 FROM message INNER JOIN handle 
+                 ON message.handle_id = handle.ROWID 
+                 WHERE is_from_me=0 AND 
+                 datetime(message.date+ strftime("%s", "2001-01-01") ,"unixepoch","localtime") >= datetime('now','-10 seconds', 'localtime')
+                 ORDER BY message.date ASC;
+                 '''
+
 
         # ## Still doesn't help with group chat
         # sqlcommand = '''
@@ -2235,6 +2257,8 @@ def logStatus(self):
                 self.logger.info(u"{0:<30} {1}".format("Triggers:", trigger.pluginTypeId +'  :  '+ trigger.name))
         self.logger.info(u"{0:<30} {1}".format("Awaiting Confirmation:", self.awaitingConfirmation))
         self.logger.info(u"{0:<30} {1}".format("Reset Last Command:", self.resetLastCommand))
+        self.logger.info(u"{0:<30} {1}".format("System Version:", platform.release() ))
+        self.logger.info(u"{0:<30} {1}".format("System Release:", platform.version() ))
 
         self.logger.info(u"{0:<30} {1}".format("Backup Directory:", self.backupfilename))
         self.logger.info(u"{0:<30} {1}".format("SQL Database Location:", self.filename))