Merge branch 'development' into 'experimental'

Development

See merge request !65

.idea/server-core.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9 (server-core)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file

DEBIAN/postinst

@@ -16,7 +16,6 @@ pip3 install -r /opt/eSign/installation/requirements.txt
 
 echo Creating database...
 mysqladmin -u root create esign
-mysql -u root esign < /opt/eSign/installation/database.sql
 password=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 20)
 if echo "CREATE USER 'esign'@'localhost' IDENTIFIED BY '$password';" | mysql -u root esign; then
   sed -i "s/password/$password/g" /opt/eSign/core/config.json
@@ -24,6 +23,7 @@ if echo "CREATE USER 'esign'@'localhost' IDENTIFIED BY '$password';" | mysql -u
   NC='\033[0m' # No Color
   printf "${RED}The mysql password is: $password${NC}\n"
 fi
+mysql -u root esign < /opt/eSign/installation/database.sql
 
 echo Starting service...
 systemctl daemon-reload

opt/eSign/core/server.py

@@ -40,7 +40,7 @@ class MyTCPSocketHandler(socketserver.BaseRequestHandler):
                     img = Image.open("images/"+signs[0][1]+".png");
 
                     #Save Preview to DB
-                    sql = "UPDATE `signs` SET `preview`=%s,`valuesChanged`=1 WHERE `uID`=%s"
+                    sql = "UPDATE `signs` SET `preview`=%s WHERE `uID`=%s"
                     val = ("data:image/png;base64,"+str(chromeRender.toBase64("images/"+data[0]+".png"))[2:][:-1],data[0])
                     mycursor.execute(sql, val)
                     mydb.commit()
@@ -71,11 +71,6 @@ class MyTCPSocketHandler(socketserver.BaseRequestHandler):
                         print("waiting")
                 else:
                     print("Not Updating")
-                    print("Requesting User-Notification")
-                    sql = "UPDATE `signs` SET `valuesChanged`=%s WHERE `uID`=%s"
-                    val = (1,data[0])
-                    mycursor.execute(sql, val)
-                    mydb.commit()
                     #Send response to eSign (NOT Updating Picture)
                     response = [0,signs[0][9]]
                     self.request.send(bytes(json.dumps(response),"ascii"))
@@ -93,7 +88,7 @@ class MyTCPSocketHandler(socketserver.BaseRequestHandler):
                 chromeRender.convertColorSpace("images/"+data[0]+".png", "WBR")
 
                 #Save Preview to DB
-                sql = "UPDATE `signs` SET `preview`=%s,`valuesChanged`=1 WHERE `uID`=%s"
+                sql = "UPDATE `signs` SET `preview`=%s WHERE `uID`=%s"
                 val = ("data:image/png;base64,"+str(chromeRender.toBase64("images/"+data[0]+".png"))[2:][:-1],data[0])
                 mycursor.execute(sql, val)
                 mydb.commit()

opt/eSign/installation/database.sql

@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `signs` (
   `batteryLevel` int(11) NOT NULL,
   `content` text NOT NULL,
   `preview` text,
-  `valuesChanged` tinyint(1) NOT NULL DEFAULT '0',
+  `notificationSend` tinyint(1) NOT NULL DEFAULT '0',
   `updateNeeded` tinyint(1) NOT NULL,
   `updateInterval` int(255) NOT NULL DEFAULT '300000',
   `firstConnection` datetime DEFAULT CURRENT_TIMESTAMP,