NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-12 19:23:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined name 'default_directory'

Browse Source
This commit is contained in:
grossmj 2024-12-02 14:36:58 +10:00
parent c05dcef54f
commit bbff6974e6
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gns3server/utils/images.py
View File

@ -70,9 +70,15 @@ async def list_images(image_type):
files.add(filename) files.add(filename)
# It the image is located in the standard directory the path is relative
if os.path.commonprefix([root, default_directory]) != default_directory:
path = os.path.join(root, filename)
else:
path = os.path.relpath(os.path.join(root, filename), default_directory)
filesize = os.stat(os.path.join(root, filename)).st_size filesize = os.stat(os.path.join(root, filename)).st_size
if filesize < 7: if filesize < 7:
log.debug("File {} is too small to be an image, skipping...".format(filename)) log.debug(f"File {filename} is too small to be an image, skipping...")
continue continue
try: try:
@ -81,29 +87,23 @@ async def list_images(image_type):
elf_header_start = f.read(7) elf_header_start = f.read(7)
if image_type == "dynamips" and elf_header_start != b'\x7fELF\x01\x02\x01': if image_type == "dynamips" and elf_header_start != b'\x7fELF\x01\x02\x01':
# IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1 # IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1
log.warning("IOS image {} does not start with a valid ELF magic number, skipping...".format(filename)) log.warning(f"IOS image {filename} does not start with a valid ELF magic number, skipping...")
continue continue
elif image_type == "iou" and elf_header_start != b'\x7fELF\x02\x01\x01' and elf_header_start != b'\x7fELF\x01\x01\x01': elif image_type == "iou" and elf_header_start != b'\x7fELF\x02\x01\x01' and elf_header_start != b'\x7fELF\x01\x01\x01':
# IOU images must start with the ELF magic number, be 32-bit or 64-bit, little endian and have an ELF version of 1 # IOU images must start with the ELF magic number, be 32-bit or 64-bit, little endian and have an ELF version of 1
log.warning("IOU image {} does not start with a valid ELF magic number, skipping...".format(filename)) log.warning(f"IOU image {filename} does not start with a valid ELF magic number, skipping...")
continue continue
elif image_type == "qemu" and elf_header_start[:4] == b'\x7fELF': elif image_type == "qemu" and elf_header_start[:4] == b'\x7fELF':
# QEMU images should not start with an ELF magic number # QEMU images should not start with an ELF magic number
log.warning("QEMU image {} starts with an ELF magic number, skipping...".format(filename)) log.warning(f"QEMU image {filename} starts with an ELF magic number, skipping...")
continue continue
# It the image is located in the standard directory the path is relative
if os.path.commonprefix([root, default_directory]) != default_directory:
path = os.path.join(root, filename)
else:
path = os.path.relpath(os.path.join(root, filename), default_directory)
images.append( images.append(
{ {
"filename": filename, "filename": filename,
"path": force_unix_path(path), "path": force_unix_path(path),
"md5sum": await wait_run_in_executor(md5sum, os.path.join(root, filename)), "md5sum": await wait_run_in_executor(md5sum, os.path.join(root, filename)),
"filesize": filesize "filesize": filesize,
} }
) )
except OSError as e: except OSError as e:
@ -165,23 +165,6 @@ async def discover_images(image_type: str, skip_image_paths: list = None) -> Lis
except InvalidImageError as e: except InvalidImageError as e:
log.debug(str(e)) log.debug(str(e))
continue continue
# It the image is located in the standard directory the path is relative
if os.path.commonprefix([root, default_directory]) != default_directory:
path = os.path.join(root, filename)
else:
path = os.path.relpath(os.path.join(root, filename), default_directory)
images.append(
{
"filename": filename,
"path": force_unix_path(path),
"md5sum": md5sum(os.path.join(root, filename)),
"filesize": filesize
}
)
except OSError as e:
log.warning("Can't add image {}: {}".format(path, str(e)))
return images return images