arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-02-17 18:42:00 +00:00
Code Issues Releases Wiki Activity

Take VMware file encoding into account. Fixes #261.

Browse Source
This commit is contained in:
Jeremy 2015-07-12 20:58:58 -06:00
parent f08817f335
commit ccd29ab500
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gns3server/modules/vmware/__init__.py
View File

@ -26,6 +26,7 @@ import shutil
import asyncio import asyncio
import subprocess import subprocess
import logging import logging
import codecs
from collections import OrderedDict from collections import OrderedDict
from gns3server.utils.interfaces import interfaces from gns3server.utils.interfaces import interfaces
@ -214,7 +215,27 @@ class VMware(BaseManager):
""" """
pairs = OrderedDict() pairs = OrderedDict()
with open(path, encoding="utf-8") as f: encoding = "utf-8"
# get the first line to read the .encoding value
with open(path, encoding=encoding) as f:
line = f.readline()
if line.startswith("#!"):
# skip the shebang
line = f.readline()
try:
key, value = line.split('=', 1)
if key.strip().lower() == ".encoding":
file_encoding = value.strip('" ')
try:
codecs.lookup(file_encoding)
encoding = file_encoding
except LookupError:
log.warning("Invalid file encoding detected in '{}': {}".format(path, file_encoding))
except ValueError:
log.warning("Couldn't find file encoding in {}, using {}...".format(path, encoding))
# read the file with the correct encoding
with open(path, encoding=encoding, errors="ignore") as f:
for line in f.read().splitlines(): for line in f.read().splitlines():
try: try:
key, value = line.split('=', 1) key, value = line.split('=', 1)
@ -232,7 +253,15 @@ class VMware(BaseManager):
:param pairs: settings to write :param pairs: settings to write
""" """
with open(path, "w", encoding="utf-8") as f: encoding = "utf-8"
if ".encoding" in pairs:
file_encoding = pairs[".encoding"]
try:
codecs.lookup(file_encoding)
encoding = file_encoding
except LookupError:
log.warning("Invalid file encoding detected in '{}': {}".format(path, file_encoding))
with open(path, "w", encoding=encoding, errors="ignore") as f:
for key, value in pairs.items(): for key, value in pairs.items():
entry = '{} = "{}"\n'.format(key, value) entry = '{} = "{}"\n'.format(key, value)
f.write(entry) f.write(entry)
@ -246,7 +275,15 @@ class VMware(BaseManager):
:param pairs: settings to write :param pairs: settings to write
""" """
with open(path, "w", encoding="utf-8") as f: encoding = "utf-8"
if ".encoding" in pairs:
file_encoding = pairs[".encoding"]
try:
codecs.lookup(file_encoding)
encoding = file_encoding
except LookupError:
log.warning("Invalid file encoding detected in '{}': {}".format(path, file_encoding))
with open(path, "w", encoding=encoding, errors="ignore") as f:
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
# write the shebang on the first line on Linux # write the shebang on the first line on Linux
vmware_path = shutil.which("vmware") vmware_path = shutil.which("vmware")