1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 00:08:11 +00:00

Update picture.py

This commit is contained in:
piotrpekala7 2021-04-08 23:29:46 +02:00
parent 4bbf7c2ed2
commit 30cbfe2154
2 changed files with 3 additions and 22 deletions

View File

@ -19,11 +19,10 @@ import os
import aiohttp
import asyncio
import urllib.parse
import xml.etree.ElementTree as ET
from gns3server.web.route import Route
from gns3server.controller import Controller
from gns3server.utils.picture import get_size
import logging
log = logging.getLogger(__name__)
@ -56,25 +55,7 @@ class SymbolHandler:
controller = Controller.instance()
symbol_id = urllib.parse.unquote(request.match_info["symbol_id"])
try:
file_content = open(controller.symbols.get_path(symbol_id), 'r').read()
svg_root = ET.fromstring(file_content)
svg_width = svg_root.get('width')
if svg_width is not None:
try:
width = int(float(svg_width))
except:
log.warning("Could not get width for symbol with id: {}".format(symbol_id))
width = 0
svg_height = svg_root.get('height')
if svg_height is not None:
try:
height = int(float(svg_height))
except:
log.warning("Could not get height for symbol with id: {}".format(symbol_id))
height = 0
width, height, _ = controller.symbols.get_size(symbol_id)
symbol_dimensions = { 'width': width, 'height': height }
response.json(symbol_dimensions)
except (KeyError, OSError) as e:

View File

@ -92,7 +92,7 @@ def get_size(data, default_width=0, default_height=0):
# End of https://github.com/shibukawa/imagesize_py
# handle SVG
elif size >= 10 and data.startswith(b'<?xml'):
elif size >= 10 and (data.startswith(b'<?xml') or data.startswith(b'<svg')):
filetype = "svg"
fhandle = io.BytesIO(data)
tree = ElementTree()