From 02de8f3c2f9a83e8ea243085700c9e3e0d32498b Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Thu, 19 Mar 2020 15:41:30 +0100
Subject: [PATCH] aggiunte altre cose

---
 driver/notifier.py    |  3 +++
 driver/tsc_manager.py |  3 +--
 driver/tsc_printer.py | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/driver/notifier.py b/driver/notifier.py
index d19c225..22b0970 100644
--- a/driver/notifier.py
+++ b/driver/notifier.py
@@ -1,6 +1,9 @@
 import requests
 import time
 
+URL_ERR = 'tscprinter/errore/'
+URL_EVENT = 'tscprinter/evento/'
+
 def notifier(django_addr, queue_out, logger):
     logger.warning("Notifier started")
     while True:
diff --git a/driver/tsc_manager.py b/driver/tsc_manager.py
index 91490e7..507a8c7 100644
--- a/driver/tsc_manager.py
+++ b/driver/tsc_manager.py
@@ -10,8 +10,7 @@ import threading, sys, queue, logging
 from driver.tsc_printer import tsc_printer
 
 Q_TIMEOUT = 2
-URL_ERR = 'tscprinter/errore/'
-URL_EVENT = 'tscprinter/evento/'
+
 
 #lancia i thread, uno per stampante
 def main(q_in :queue.Queue, q_out :queue.Queue, q_comm: queue.Queue, logger: logging.getLogger):
diff --git a/driver/tsc_printer.py b/driver/tsc_printer.py
index f253a4d..48253e1 100644
--- a/driver/tsc_printer.py
+++ b/driver/tsc_printer.py
@@ -9,18 +9,33 @@ import queue, sys, time, socket, logging
 SOCK_TIMEOUT = 2
 
 def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: str, port: int, logger: logging.getLogger):
+	prt = None 
+	
+	def lista_file():
+		nonlocal prt
+		pass
+	
+	def invia_file(name=None, content=None):
+		nonlocal prt
+		pass
+	
+	def elimina_file(name=None):
+		nonlocal prt 
 		
-	def riconnetti_socket():
 		pass
 	
-	def invia_file():
+	def muovi_file(name=None):
+		#per default muove i file dalla RAM alla FLASH
+		nonlocal prt
 		pass
 	
-	def elimina_file():
+	def esegui(name=None):
+		nonlocal prt
 		pass
 	
-	def muovi_file():
-		pass
+	def stato():
+		nonlocal prt
+		return sts
 	
 	while True: # connetti mantieni vivo il socket
 		try:
@@ -28,15 +43,20 @@ def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: s
 				prt.create_connection(address=(ip, port), timeout=SOCK_TIMEOUT)
 				while True:
 					itm = q_in.get(block=True)
+					prt_cmd = ""
 					cmd = itm['name']
 					par = itm['parameters']
 					if cmd == 'DOWNLOAD':
+						invia_file(par['name'], par['lines'])
 						pass
 					elif cmd == 'REMOVE':
+						elimina_file(par['name'])
 						pass
 					elif cmd == 'MOVE':
+						muovi_file(par['name'])
 						pass
 					elif cmd == 'LIST':
+						q_out.put({'url='})
 						pass
 					elif cmd == 'RUN':
 						pass
@@ -46,6 +66,10 @@ def tsc_printer(q_in: queue.Queue, q_out: queue.Queue, q_cmd: queue.Queue, ip: s
 			logger.error(f"Stampante {__name__} irraggiungibile:{st}")
 			prt.close()
 			del prt
+		except socket.error as se:
+			logger.error(f"Errore generico stamoante {__name__}: {se}")
+			prt.close()
+			del prt
 		except Exception as e:
 			logger.error("Errore generale inizializzando la stampante: {}".format(e))