Fix delete snapshot

GNS3 · Jul 26, 2016 · e3d9c3b · e3d9c3b
1 parent cf71288
commit e3d9c3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/gns3server/controller/snapshot.py b/gns3server/controller/snapshot.py
@@ -39,15 +39,15 @@ def __init__(self, project, name=None, filename=None):
         if name:
             self._name = name
             self._created_at = datetime.now().timestamp()
+            filename = self._name + "_" + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime(FILENAME_TIME_FORMAT) + ".gns3project"
         else:
-            filename = filename.split(".")[0]
             self._name = filename.split("_")[0]
-            filename = filename.replace(self._name + "_", "")
+            datestring = filename.replace(self._name + "_", "").split(".")[0]
             try:
-                self._created_at = datetime.strptime(filename, FILENAME_TIME_FORMAT).replace(tzinfo=timezone.utc).timestamp()
+                self._created_at = datetime.strptime(datestring, FILENAME_TIME_FORMAT).replace(tzinfo=timezone.utc).timestamp()
             except ValueError:
                 self._created_at = datetime.utcnow().timestamp()
-        self._path = os.path.join(project.path, "snapshots", self._name + "_" + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime(FILENAME_TIME_FORMAT) + ".gns3project")
+        self._path = os.path.join(project.path, "snapshots", filename)
 
     @property
     def id(self):

diff --git a/gns3server/handlers/api/controller/snapshot_handler.py b/gns3server/handlers/api/controller/snapshot_handler.py
@@ -80,5 +80,4 @@ def delete(request, response):
         controller = Controller.instance()
         project = controller.get_project(request.match_info["project_id"])
         yield from project.delete_snapshot(request.match_info["snapshot_id"])
-        controller.remove_project(project)
         response.set_status(204)