arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Don't clean logo images when applied to the project

Browse Source
This commit is contained in:
ziajka 2018-05-08 16:22:35 +02:00
parent f2700ed445
commit 0bcc657bf1
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/controller/project.py
View File

@ -725,6 +725,15 @@ class Project:
except KeyError: except KeyError:
pass pass
# don't remove supplier's logo
if self.supplier:
try:
logo = self.supplier['logo']
pictures.remove(logo)
except KeyError:
pass
for pict in pictures: for pict in pictures:
os.remove(os.path.join(self.pictures_directory, pict)) os.remove(os.path.join(self.pictures_directory, pict))
except OSError as e: except OSError as e:

20
tests/controller/test_project.py
View File

@ -397,6 +397,26 @@ def test_clean_pictures(async_run, project, controller):
assert not os.path.exists(os.path.join(project.pictures_directory, "test2.png")) assert not os.path.exists(os.path.join(project.pictures_directory, "test2.png"))
def test_clean_pictures_and_keep_supplier_logo(async_run, project, controller):
"""
When a project is close old pictures should be removed
"""
project.supplier = {
'logo': 'logo.png'
}
drawing = async_run(project.add_drawing())
drawing._svg = "test.png"
open(os.path.join(project.pictures_directory, "test.png"), "w+").close()
open(os.path.join(project.pictures_directory, "test2.png"), "w+").close()
open(os.path.join(project.pictures_directory, "logo.png"), "w+").close()
async_run(project.close())
assert os.path.exists(os.path.join(project.pictures_directory, "test.png"))
assert not os.path.exists(os.path.join(project.pictures_directory, "test2.png"))
assert os.path.exists(os.path.join(project.pictures_directory, "logo.png"))
def test_delete(async_run, project, controller): def test_delete(async_run, project, controller):
assert os.path.exists(project.path) assert os.path.exists(project.path)
async_run(project.delete()) async_run(project.delete())