feat(www): handle compressed files

Signed-off-by: Cedric Hombourger <[email protected]>

Author: chombourger

mtda-www

@@ -23,6 +23,7 @@ import uuid
 import zmq.asyncio
 
 from mtda.client import Client
+from mtda.utils import Compression
 import mtda.constants as CONSTS
 from mtda.console.remote import RemoteConsole
 from mtda.console.screen import ScreenOutput
@@ -155,9 +156,17 @@ class StorageOpenHandler(BaseHandler):
         mtda = self.application.settings['mtda']
         result = ''
         if mtda is not None:
+            compr = CONSTS.IMAGE.RAW.value
+            file = self.get_argument('file')
+            if file:
+                mtda.debug(2, f'file to be uploaded: {file}')
+                compr = Compression.from_extension(file)
+            mtda.storage_compression(compr)
+
             sid = self.get_argument('session')
             zmq_socket = mtda.storage_open(session=sid)
             self.application.settings['sockets'][sid] = zmq_socket
+
         self.result_as_json({"result": result})
 
 
@@ -241,7 +250,8 @@ class WebOutput(ScreenOutput):
     def session_event(self, info):
         if info[0] == 'INACTIVE':
             sid = info[1]
-            del self.application.settings['sockets'][sid]
+            if sid in self.application.settings['sockets']:
+                del self.application.settings['sockets'][sid]
 
     def write(self, data):
         data = base64.b64encode(data).decode('utf-8')

mtda/client.py

@@ -21,6 +21,7 @@
 import zstandard as zstd
 
 from mtda.main import MultiTenantDeviceAccess
+from mtda.utils import Compression
 import mtda.constants as CONSTS
 
 
@@ -327,20 +328,6 @@ def __init__(self, path, agent, session, blksz, callback=None):
     def bmap(self, path):
         return None
 
-    def compression(self):
-        path = self._path
-        if path.endswith(".bz2"):
-            result = CONSTS.IMAGE.BZ2.value
-        elif path.endswith(".gz"):
-            result = CONSTS.IMAGE.GZ.value
-        elif path.endswith(".zst"):
-            result = CONSTS.IMAGE.ZST.value
-        elif path.endswith(".xz"):
-            result = CONSTS.IMAGE.XZ.value
-        else:
-            result = CONSTS.IMAGE.RAW.value
-        return result
-
     def flush(self):
         # Wait for background writes to complete
         agent = self._agent
@@ -366,7 +353,9 @@ def path(self):
         return self._path
 
     def prepare(self, socket, output_size=None, compression=None):
-        compr = self.compression() if compression is None else compression
+        compr = None
+        if compression is None:
+            compr = Compression.from_extension(self._path)
         self._inputsize = self.size()
         self._outputsize = output_size
         self._socket = socket
@@ -416,7 +405,7 @@ def copy(self):
 
         image = open(self._path, 'rb')
         comp_on_the_fly = False
-        if self.compression() == CONSTS.IMAGE.RAW.value:
+        if Compression.from_extension(self._path) == CONSTS.IMAGE.RAW.value:
             cctx = zstd.ZstdCompressor(level=1)
             comp_on_the_fly = True
             inputstream = cctx.stream_reader(image)

mtda/templates/index.html

@@ -157,14 +157,6 @@
           uploadWindow.focus();
         });
       });
-      $(function() {
-        $('#upload').bind('click', function() {
-          $.getJSON('./storage-open', {session: localStorage.getItem('session')}, function(data) {
-            // do nothing
-          });
-          return false;
-        });
-      });
     </script>
     <script src="./assets/xterm.js"></script>
     <script src="./assets/addon-fit.js"></script>
@@ -190,8 +182,24 @@
       const video = document.getElementById("video");
       const power_status = document.getElementById("power-status-icon")
       const storage_status = document.getElementById("storage-status-icon")
+
       const dropzone = document.getElementById('dropzone');
       const upload = document.getElementById('upload');
+      const CHUNK_SIZE = 512 * 1024;
+      let selectedFile = null;
+      let maySend = false;
+
+      $(function() {
+        $('#upload').bind('click', function() {
+          $.getJSON('./storage-open', {
+		  file: selectedFile.name,
+		  session: localStorage.getItem('session')
+	  }, function(data) {
+            // do nothing
+          });
+          return false;
+        });
+      });
 
       function console_output(data) {
         if (data.output != null) {
@@ -330,10 +338,6 @@
         }
       }
 
-      const CHUNK_SIZE = 512 * 1024;
-      let selectedFile = null;
-      let maySend = false;
-
       ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
         dropzone.addEventListener(eventName, (e) => e.preventDefault());
       });
@@ -350,6 +354,7 @@
         const files = event.dataTransfer.files;
         if (files.length) {
           selectedFile = files[0];
+	  console.log('will upload '+selectedFile.name);
           dropzone.textContent = `${selectedFile.name}`;
           upload.disabled = false;
         }

mtda/utils.py

@@ -10,6 +10,22 @@
 # ---------------------------------------------------------------------------
 
 import threading
+import mtda.constants as CONSTS
+
+
+class Compression:
+    def from_extension(path):
+        if path.endswith(".bz2"):
+            result = CONSTS.IMAGE.BZ2.value
+        elif path.endswith(".gz"):
+            result = CONSTS.IMAGE.GZ.value
+        elif path.endswith(".zst"):
+            result = CONSTS.IMAGE.ZST.value
+        elif path.endswith(".xz"):
+            result = CONSTS.IMAGE.XZ.value
+        else:
+            result = CONSTS.IMAGE.RAW.value
+        return result
 
 
 class RepeatTimer(threading.Timer):