V2 Compatibility #74
Merged
V2 Compatibility #74
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MattReimer
requested changes
Jul 22, 2022
src/classes/net_sync.py
Outdated
| @@ -143,7 +143,8 @@ def _syncFiles(self): | |||
| self.setProgress(self.progress) | |||
|
|
|||
| for remote_path, remote_md5 in businesslogics.items(): | |||
| local_path = os.path.join(self.business_logic_xml_dir, os.path.basename(remote_path)) | |||
| # local_path = os.path.join(self.business_logic_xml_dir, os.path.basename(remote_path)) | |||
There was a problem hiding this comment.
You can remove the comment here. We have git to remind us what the old value is. No sense cluttering up the codebase with old stuff.
src/classes/project.py
Outdated
| # If this is a geopackage it's special | ||
| if new_proj_el.getparent().tag == 'Layers': | ||
| layer_name = new_proj_el.find('Path').text | ||
| if self.project.attrib['{http://www.w3.org/2001/XMLSchema-instance}noNamespaceSchemaLocation'] == 'https://xml.riverscapes.xyz/Projects/XSD/V2/RiverscapesProject.xsd': |
There was a problem hiding this comment.
can we set self.version on the project so that we don't need to have this logic in two places?
Also I think we should remove the hardcoded aspects of this url to the config file. I'll elaborate when we talk.
src/classes/project.py
Outdated
| @@ -89,12 +89,15 @@ def _load_businesslogic(self): | |||
|
|
|||
| # Case-sensitive filename we expect | |||
| bl_filename = '{}.xml'.format(self.project_type) | |||
| bl_file_dir = bl_filename | |||
| if self.project.attrib['{http://www.w3.org/2001/XMLSchema-instance}noNamespaceSchemaLocation'] == 'https://xml.riverscapes.xyz/Projects/XSD/V2/RiverscapesProject.xsd': | |||
| bl_file_dir = os.path.join('V2', bl_filename) | |||
There was a problem hiding this comment.
This variable is called dir but it has the name appended to it. Maybe rename this variable bl_full_path or something
|
@kunztr we talked about a few ideas use regexes and move bespoke strings up into a GLOBAL variable at the top of the file VERSIONS = {
"V1": "\/V1\/[a-zA-Z]+.xsd",
"V2": "\/V2\/RiverscapesProject.xsd",
}
SCHEMALOCATION_ATTRIB = '{http://www.w3.org/2001/XMLSchema-instance}noNamespaceSchemaLocation'
# Then you can match it with regexesx
if(re.match(VERSIONS["V1"], <address here>)):
self.version == 'V1' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added functionality to handle V2 businesslogic (syncing V2 files, determining when to use V2 files, ensuring old projects still work)