Additional support for windows #475
Conversation
| print(f"--> Moving file {src} to {dest}") | ||
| self._check_file_exists(dest, should_exist=False) | ||
| self.copy(src, dest) |
There was a problem hiding this comment.
Avoiding the use of copy because dest is a file, and we don't it to automatically create /path/to/file.txt/ as a folder
powersimdata/scenario/delete.py
Outdated
| @@ -41,25 +40,21 @@ def delete_scenario(self, confirm=True): | |||
| self._scenario_list_manager.delete_entry(scenario_id) | |||
| self._execute_list_manager.delete_entry(scenario_id) | |||
|
|
|||
| wildcard = f"{scenario_id}_*" | |||
|
|
|||
| print("--> Deleting scenario input data on server") | |||
There was a problem hiding this comment.
I believe we delete locally when using plug. Printing "Deleting scenario input data" will then be always correct. Or perhaps, we can take advantage of the description attribute to custom the message
powersimdata/scenario/delete.py
Outdated
| print("--> Deleting scenario input data on server") | ||
| target = posixpath.join(self.path_config.input_dir(), wildcard) | ||
| target = self._data_access.match_scenario_files(scenario_id, "input") | ||
| self._data_access.remove(target, recursive=False, confirm=confirm) | ||
|
|
||
| print("--> Deleting scenario output data on server") |
powersimdata/scenario/delete.py
Outdated
| self._data_access.remove(tmp_dir, recursive=True, confirm=confirm) | ||
|
|
||
| print("--> Deleting input and output data on local machine") | ||
| target = os.path.join(server_setup.LOCAL_DIR, "data", "**", wildcard) | ||
| target = os.path.join(server_setup.LOCAL_DIR, "data", "**", f"{scenario_id}_*") |
There was a problem hiding this comment.
Can we do a LocalDataAccess().join here and get rid of the import os. It will be nice to be fully OS independent in the class.
powersimdata/scenario/execute.py
Outdated
| ) | ||
| self.TMP_DIR = self._data_access.match_scenario_files(self.scenario_id, "tmp") | ||
|
|
||
| def create_folder(self): | ||
| """Creates folder on server that will enclose simulation inputs.""" | ||
| print("--> Creating temporary folder on server for simulation inputs") |
There was a problem hiding this comment.
I guess the the temporary folder can be crated either on the local machine or the server. Perhaps we can the description attribute here too.
| raise IOError(f"Failed to copy {kind}.csv on server") | ||
| from_dir = self._data_access.match_scenario_files(profile_as, "tmp") | ||
| to_dir = self.TMP_DIR | ||
| self._data_access.copy(f"{from_dir}/{kind}.csv", to_dir) |
There was a problem hiding this comment.
It is kind of confusing to move to using relative path but to copy with absolute path
There was a problem hiding this comment.
Agree, I just didn't know a cleaner way to do it. The reason for this is mainly how we use copy within move.py, where the destination (backup disk) is not relative to the self.root. Maybe we can revisit this in another PR.
jenhagg
force-pushed
the
jon/paths
branch
2 times, most recently
from
a4f286b to
de99742
Compare
|
Rebased and fixed the test that was still calling |
Purpose
Address several places that were not platform independent.
What the code is doing
execute_commandin the local case, as it relied on/bin/bashDataAccess.joinattribute according to the subclass, removing hard codedposixpath.joinin calling codeget_base_dirandmatch_scenario_filesto encapsulate the logic of creating paths, along with tests for theseInputDataandOutputDatawhich were relying on the values fromserver_setup.py, which had posixpath implicitly hard coded (e.g.INPUT_DIR = data/input). We delay the path join by using a tuple insteadTesting
LocalDataAccess)SSHDataAccess)Time estimate
20 mins