Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-09 23:10:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

state: convert input/output/code/argv paths to unix format

Browse Source 
This is a temporary solution that allows us to keep our state
files compatible across platforms. A more proper way to achieve
this would be to redo our core to only operate using posixpath,
same way as git does. See #198.

Fixes #78

Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2017-09-03 20:10:54 +03:00
parent c051f513a8
commit e8f3747f2b
1 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/state_file.py
+52 -20
View File
@@ -1,4 +1,5 @@
import os
import ntpath
import sys
import json
import time
@@ -90,41 +91,72 @@ class StateFile(object):
def argv(self):
return self._argv
@staticmethod
def _replace_paths(l, old, new):
if os.path != ntpath:
return l
ret = []
for x in l:
if x == None:
ret.append(None)
continue
ret.append(x.replace(old, new))
return ret
@staticmethod
def decode_paths(l):
return StateFile._replace_paths(l, '/', '\\')
@staticmethod
def decode_path(p):
return StateFile.decode_paths([p])[0]
@staticmethod
def encode_paths(l):
return StateFile._replace_paths(l, '\\', '/')
@staticmethod
def encode_path(p):
return StateFile.encode_paths([p])[0]
@staticmethod
def load(filename, settings):
with open(filename, 'r') as fd:
data = json.load(fd)
return StateFile(data.get(StateFile.PARAM_COMMAND),
return StateFile(StateFile.decode_path(data.get(StateFile.PARAM_COMMAND)),
filename,
settings,
data.get(StateFile.PARAM_INPUT_FILES, []),
data.get(StateFile.PARAM_OUTPUT_FILES, []),
data.get(StateFile.PARAM_CODE_DEPENDENCIES, []),
StateFile.decode_paths(data.get(StateFile.PARAM_INPUT_FILES, [])),
StateFile.decode_paths(data.get(StateFile.PARAM_OUTPUT_FILES, [])),
StateFile.decode_paths(data.get(StateFile.PARAM_CODE_DEPENDENCIES, [])),
data.get(StateFile.PARAM_LOCKED, False),
data.get(StateFile.PARAM_ARGV),
data.get(StateFile.PARAM_STDOUT),
data.get(StateFile.PARAM_STDERR),
StateFile.decode_paths(data.get(StateFile.PARAM_ARGV)),
StateFile.decode_path(data.get(StateFile.PARAM_STDOUT)),
StateFile.decode_path(data.get(StateFile.PARAM_STDERR)),
data.get(StateFile.PARAM_CREATED_AT),
data.get(StateFile.PARAM_CWD),
StateFile.decode_path(data.get(StateFile.PARAM_CWD)),
data.get(StateFile.PARAM_SHELL, False))
def save(self):
argv = self._argv_paths_normalization(self._argv)
res = {
self.PARAM_COMMAND: self.command,
self.PARAM_TYPE: self.MAGIC,
self.PARAM_VERSION: self.VERSION,
self.PARAM_ARGV: argv,
self.PARAM_CWD: self.cwd,
self.PARAM_CREATED_AT: self.created_at,
self.PARAM_INPUT_FILES: self.input_files,
self.PARAM_OUTPUT_FILES: self.output_files,
self.PARAM_CODE_DEPENDENCIES: self.code_dependencies,
self.PARAM_STDOUT: self.stdout,
self.PARAM_STDERR: self.stderr,
self.PARAM_SHELL: self.shell
self.PARAM_COMMAND: self.encode_path(self.command),
self.PARAM_TYPE: self.MAGIC,
self.PARAM_VERSION: self.VERSION,
self.PARAM_ARGV: self.encode_paths(argv),
self.PARAM_CWD: self.encode_path(self.cwd),
self.PARAM_CREATED_AT: self.created_at,
self.PARAM_INPUT_FILES: self.encode_paths(self.input_files),
self.PARAM_OUTPUT_FILES: self.encode_paths(self.output_files),
self.PARAM_CODE_DEPENDENCIES: self.encode_paths(self.code_dependencies),
self.PARAM_STDOUT: self.encode_path(self.stdout),
self.PARAM_STDERR: self.encode_path(self.stderr),
self.PARAM_SHELL: self.shell,
}
if self.locked: