3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Code style: Use double quotes for strings

Browse source 
Contributes to issue CURA-5483.
This commit is contained in:
Ghostkeeper 2018-10-12 15:37:43 +02:00
parent 69cef98c30
commit 6ac10db582
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerLookup.py
View file

@ -17,23 +17,23 @@ def get_settings_key_for_machine(machine_id: int) -> str:
def default_parse_version_response(response: str) -> Version:
raw_str = response.split('\n', 1)[0].rstrip()
return Version(raw_str.split('.')) # Split it into a list; the default parsing of 'single string' is different.
raw_str = response.split("\n", 1)[0].rstrip()
return Version(raw_str.split(".")) # Split it into a list; the default parsing of "single string" is different.
class FirmwareUpdateCheckerLookup:
JSON_NAME_TO_VERSION_PARSE_FUNCTION = {"default": default_parse_version_response}
def __init__(self, json_path) -> None:
# Open the .json file with the needed lookup-lists for each machine(/model) and retrieve 'raw' json.
# Open the .json file with the needed lookup-lists for each machine(/model) and retrieve "raw" json.
machines_json = None
with open(json_path, "r", encoding="utf-8") as json_file:
machines_json = json.load(json_file).get("machines")
if machines_json is None:
Logger.log('e', "Missing or inaccessible: {0}".format(json_path))
Logger.log("e", "Missing or inaccessible: {0}".format(json_path))
return
# Parse all the needed lookup-tables from the '.json' file(s) in the resources folder.
# Parse all the needed lookup-tables from the ".json" file(s) in the resources folder.
self._machine_ids = [] # type:List[int]
self._machine_per_name = {} # type:Dict[str, int]
self._parse_version_url_per_machine = {} # type:Dict[int, Callable]
@ -48,15 +48,15 @@ class FirmwareUpdateCheckerLookup:
version_parse_function = \
self.JSON_NAME_TO_VERSION_PARSE_FUNCTION.get(machine_json.get("version_parser"))
if version_parse_function is None:
Logger.log('w', "No version-parse-function specified for machine {0}.".format(machine_name))
Logger.log("w", "No version-parse-function specified for machine {0}.".format(machine_name))
version_parse_function = default_parse_version_response # Use default instead if nothing is found.
self._parse_version_url_per_machine[machine_id] = version_parse_function
self._check_urls_per_machine[machine_id] = [] # Multiple check-urls: see '_comment' in the .json file.
self._check_urls_per_machine[machine_id] = [] # Multiple check-urls: see "_comment" in the .json file.
for check_url in machine_json.get("check_urls"):
self._check_urls_per_machine[machine_id].append(check_url)
self._redirect_user_per_machine[machine_id] = machine_json.get("update_url")
except Exception as ex:
Logger.log('e', "Couldn't parse firmware-update-check loopup-lists from file because {0}.".format(ex))
Logger.log("e", "Couldn't parse firmware-update-check loopup-lists from file because {0}.".format(ex))
def getMachineIds(self) -> List[int]:
return self._machine_ids