fix music package removal

CoderBotOrg · previ · Jul 8, 2022 · Jan 21, 2022 · Jan 22, 2022 · Jan 23, 2022
commit c90ccf8a1d95c276e78fd5c38557b3b1d4861978
diff --git a/api.py b/api.py
@@ -6,6 +6,7 @@
 import os
 import subprocess
 import json
+import logging
 import connexion
 from tinydb import TinyDB, Query
 from tinydb.operations import delete
@@ -187,7 +188,7 @@ def listMusicPackages():
     """
     musicPkg = MusicPackageManager.get_instance()
     response = musicPkg.listPackages()
-    return json.dumps(response.__dict__)
+        return json.dumps(response)
 
 def updateMusicPackages():
     """
@@ -209,6 +210,14 @@ def updateMusicPackages():
     elif response == 3:
         return 400
 
+def deleteMusicPackage(package_data):
+    """
+    Delete a musical package an save the list of available packages on disk
+    also delete package sounds and directory
+    """
+    musicPkg = MusicPackageManager.get_instance()
+    musicPkg.deletePackage(package_data['package_name'])
+    return 200 
 
 ## Programs
 

diff --git a/main.py b/main.py
@@ -162,17 +162,6 @@ def handle_config():
     app.bot_config = Config.get()
     return "ok"
 
-@app.route("/deletepkg", methods=["POST"])
-def handle_packages():
-    """
-    Delete a musical package an save the list of available packages on disk
-    also delete package sounds and directory
-    """
-    packageName = request.form.get("nameID")
-    musicPkg = MusicPackageManager.get_instance()
-    musicPkg.deletePackage(packageName)
-    return "package deleted"
-
 @app.route("/config", methods=["GET"])
 def returnConfig():
     """

diff --git a/musicPackages.py b/musicPackages.py
@@ -28,10 +28,12 @@
 
 import json
 import os
+import logging
+import copy
 
 class MusicPackage:
 
-    def __init__(self, nameID, category, name_IT,n ame_EN, version, date):
+    def __init__(self, nameID, category, name_IT, name_EN, version, date):
         self.nameID = nameID
         self.category = category
         self.name_IT = name_IT
@@ -87,7 +89,6 @@ class MusicPackageManager:
     def get_instance(cls):
         if cls._instance is None:
             cls._instance = MusicPackageManager()
-            print("make MusicPackageManager")
         return cls._instance
 
     def __init__(self):
@@ -107,7 +108,14 @@ def __init__(self):
                     self.packages[p] = mp
 
     def listPackages(self):
-        return self.packages
+        packages_serializable = dict()
+        for name, package in self.packages.items():
+            package_copy = copy.deepcopy(package)
+            packages_serializable[name] = package_copy.__dict__
+            packages_serializable[name]['interfaces'] = []
+            for i in package.interfaces:
+                packages_serializable[name]['interfaces'].append(i.__dict__)
+        return packages_serializable
 
     def updatePackages(self):
         newdict = { 'packages': {} }
@@ -128,25 +136,26 @@ def updatePackages(self):
             newdict['packages'][nameID]['interface']['advanced']['icon'] = self.packages[element].getInterfaces()[2].getIcon()
 
         #json_packages = json.dumps(newdict)
-        with open('./dist/static/music_package.json', 'w', encoding='utf-8') as json_file:
+        with open('sounds/notes/music_package.json', 'w', encoding='utf-8') as json_file:
             json.dump(newdict, json_file, ensure_ascii=False, indent=4)
 
 
     def deletePackage(self, packageName):
-       if packageName in self.packages:
-           del self.packages[packageName]        
-           self.updatePackages()
-       else:
-          print("errore, il pacchetto " + packageName + " non è stato trovato")
-          return 2
+        logging.info("packageName: " + packageName)
+        if packageName in self.packages:
+            del self.packages[packageName]        
+            self.updatePackages()
+        else:
+            logging.error("errore, il pacchetto " + packageName + " non è stato trovato")
+            return 2
 
-       if os.path.exists('./sounds/notes/' + packageName):
-           os.system('rm -rf ./sounds/notes/' + packageName)
-           return 1
+        if os.path.exists('./sounds/notes/' + packageName):
+            os.system('rm -rf ./sounds/notes/' + packageName)
+            return 1
 
 
     def verifyVersion(self, packageName, version):
-        print("verifica pacchetto")
+        logging.info("verifica pacchetto")
         #newversionList = version.split('.')
         if packageName not in self.packages:
             return True
@@ -169,15 +178,15 @@ def verifyVersion(self, packageName, version):
     def addPackage(self, filename):
         pkgnames = filename.split('_')
         version = pkgnames[1].replace('.zip', '')
-        print(version)
+        logging.info("Music Package version: " + version)
         pkgname = pkgnames[0]
         pkgpath = './sounds/notes/' + pkgname
         if not self.verifyVersion(pkgname, version):
             if (version == self.packages[pkgname].getVersion()):
-                print("errore, il pacchetto " + pkgname + " ha versione identica a quello attualmente installato")
+                logging.error("errore, il pacchetto " + pkgname + " ha versione identica a quello attualmente installato")
                 return 3
             else:
-                print("errore, il pacchetto " + pkgname + " ha versione precendente a quello attualmente installato")
+                logging.info("errore, il pacchetto " + pkgname + " ha versione precendente a quello attualmente installato")
                 return 2
         else:
 
@@ -187,7 +196,7 @@ def addPackage(self, filename):
             os.system('mv ./updatePackages/' + pkgname + "/" + 'audio.wav ' + pkgpath + '/')
 
             with open('./updatePackages/' + pkgname + '/' + pkgname + '.json') as json_file:
-                print("adding " + pkgname + " package")
+                logging.info("adding " + pkgname + " package")
                 data = json.load(json_file)
                 for p in data['packages']:
                     package = data['packages'][p]

diff --git a/v2.yml b/v2.yml
@@ -81,6 +81,24 @@ paths:
       responses:
         200:
           description: "ok"
+  /deleteMusicPackage:
+    post:
+      operationId: "api.deleteMusicPackage"
+      summary: "Delete Music Package"
+      parameters:
+        - name: package_data
+          in: body
+          schema:
+            type: object
+            properties:
+              package_name:
+                type: string
+      responses:
+        200:
+          description: "ok"
+        400:
+          description: "not found"
+
   /updateFromPackage:
     post:
       operationId: "api.updateFromPackage"