From c98a10dcfd23dc6c4984e1c3bc95ada73231afd7 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Fri, 3 Jun 2022 11:26:26 +0700
Subject: [PATCH] Do not tweak zstd compression params

---
 gns3server/controller/export_project.py  |  1 -
 gns3server/controller/import_project.py  | 16 ++++++++--------
 gns3server/utils/asyncio/aiozipstream.py |  5 +++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gns3server/controller/export_project.py b/gns3server/controller/export_project.py
index 3b308a3f..4ae976d2 100644
--- a/gns3server/controller/export_project.py
+++ b/gns3server/controller/export_project.py
@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
 import json
 import asyncio
 import aiofiles
diff --git a/gns3server/controller/import_project.py b/gns3server/controller/import_project.py
index f653cece..545c4ac1 100644
--- a/gns3server/controller/import_project.py
+++ b/gns3server/controller/import_project.py
@@ -20,10 +20,10 @@ import sys
 import json
 import uuid
 import shutil
-import zipfile
 import aiofiles
 import itertools
 import tempfile
+import gns3server.utils.zipfile_zstd as zipfile_zstd
 
 from .controller_error import ControllerError
 from .topology import load_topology
@@ -60,9 +60,9 @@ async def import_project(controller, project_id, stream, location=None, name=Non
         raise ControllerError("The destination path should not contain .gns3")
 
     try:
-        with zipfile.ZipFile(stream) as zip_file:
+        with zipfile_zstd.ZipFile(stream) as zip_file:
             project_file = zip_file.read("project.gns3").decode()
-    except zipfile.BadZipFile:
+    except zipfile_zstd.BadZipFile:
         raise ControllerError("Cannot import project, not a GNS3 project (invalid zip)")
     except KeyError:
         raise ControllerError("Cannot import project, project.gns3 file could not be found")
@@ -92,9 +92,9 @@ async def import_project(controller, project_id, stream, location=None, name=Non
         raise ControllerError("The project name contain non supported or invalid characters")
 
     try:
-        with zipfile.ZipFile(stream) as zip_file:
+        with zipfile_zstd.ZipFile(stream) as zip_file:
             await wait_run_in_executor(zip_file.extractall, path)
-    except zipfile.BadZipFile:
+    except zipfile_zstd.BadZipFile:
         raise ControllerError("Cannot extract files from GNS3 project (invalid zip)")
 
     topology = load_topology(os.path.join(path, "project.gns3"))
@@ -264,11 +264,11 @@ async def _import_snapshots(snapshots_path, project_name, project_id):
             # extract everything to a temporary directory
             try:
                 with open(snapshot_path, "rb") as f:
-                    with zipfile.ZipFile(f) as zip_file:
+                    with zipfile_zstd.ZipFile(f) as zip_file:
                         await wait_run_in_executor(zip_file.extractall, tmpdir)
             except OSError as e:
                 raise ControllerError(f"Cannot open snapshot '{os.path.basename(snapshot)}': {e}")
-            except zipfile.BadZipFile:
+            except zipfile_zstd.BadZipFile:
                 raise ControllerError(
                     f"Cannot extract files from snapshot '{os.path.basename(snapshot)}': not a GNS3 project (invalid zip)"
                 )
@@ -294,7 +294,7 @@ async def _import_snapshots(snapshots_path, project_name, project_id):
 
             # write everything back to the original snapshot file
             try:
-                with aiozipstream.ZipFile(compression=zipfile.ZIP_STORED) as zstream:
+                with aiozipstream.ZipFile(compression=zipfile_zstd.ZIP_STORED) as zstream:
                     for root, dirs, files in os.walk(tmpdir, topdown=True, followlinks=False):
                         for file in files:
                             path = os.path.join(root, file)
diff --git a/gns3server/utils/asyncio/aiozipstream.py b/gns3server/utils/asyncio/aiozipstream.py
index 2510fe8e..c1f74169 100644
--- a/gns3server/utils/asyncio/aiozipstream.py
+++ b/gns3server/utils/asyncio/aiozipstream.py
@@ -71,8 +71,9 @@ def _get_compressor(compress_type, compresslevel=None):
     elif compress_type == ZIP_ZSTANDARD:
         import zstandard as zstd
         if compresslevel is not None:
-            params = zstd.ZstdCompressionParameters.from_level(compresslevel, threads=-1, enable_ldm=True, window_log=31)
-            return zstd.ZstdCompressor(compression_params=params).compressobj()
+            #params = zstd.ZstdCompressionParameters.from_level(compresslevel, threads=-1, enable_ldm=True, window_log=31)
+            #return zstd.ZstdCompressor(compression_params=params).compressobj()
+            return zstd.ZstdCompressor(level=compresslevel).compressobj()
         return zstd.ZstdCompressor().compressobj()
     else:
         return None