Medcat conversion model name hotfix (#122)

* Avoid mid-name .zip format on model conversion

* Set old model name even if loading from folder

Author: mart-r

medcat-v2/medcat/utils/legacy/conversion_all.py

@@ -31,9 +31,12 @@ def __init__(self, medcat1_model_pack_path: str,
                  ser_type: AvailableSerialisers = AvailableSerialisers.dill):
         if medcat1_model_pack_path.endswith(".zip"):
             folder_path = medcat1_model_pack_path[:-4]
-            self.old_model_name = os.path.split(medcat1_model_pack_path)[1]
+            self.old_model_name = os.path.split(
+                medcat1_model_pack_path)[1].rsplit(".zip", 1)[0]
             unpack(medcat1_model_pack_path, folder_path)
             medcat1_model_pack_path = folder_path
+        else:
+            self.old_model_name = os.path.split(medcat1_model_pack_path)[1]
         if not os.path.isdir(medcat1_model_pack_path):
             raise ValueError(
                 "Provided model path is not a directory: "