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

cache: Cosmetic changes 💅 (#1321)

Browse Source
This commit is contained in:
Mr. Outis
2018-11-13 13:30:34 -06:00
committed by GitHub
parent fc7545b6cf
commit 55eadba0ec
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/cache.py
+10 -9
View File
@@ -12,24 +12,25 @@ class Cache(object):
self.project = project
config = project.config._config[Config.SECTION_CACHE]
local = config.get(Config.SECTION_CACHE_LOCAL)
local = config.get(Config.SECTION_CACHE_LOCAL, None)
if local:
name = Config.SECTION_REMOTE_FMT.format(local)
sect = project.config._config[name]
else:
sect = {}
cache_dir = config.get(Config.SECTION_CACHE_DIR, self.CACHE_DIR)
cache_type = config.get(Config.SECTION_CACHE_TYPE)
protected = config.get(Config.SECTION_CACHE_PROTECTED)
if not os.path.isabs(cache_dir):
cache_dir = os.path.join(project.dvc_dir, cache_dir)
cache_dir = os.path.abspath(os.path.realpath(cache_dir))
sect[Config.SECTION_REMOTE_URL] = cache_dir
t = config.get(Config.SECTION_CACHE_TYPE, None)
if t:
sect[Config.SECTION_CACHE_TYPE] = t
protected = config.get(Config.SECTION_CACHE_PROTECTED, None)
if protected is not None:
sect[Config.SECTION_CACHE_PROTECTED] = protected
sect = {
Config.SECTION_REMOTE_URL: cache_dir,
Config.SECTION_CACHE_TYPE: cache_type,
Config.SECTION_CACHE_PROTECTED: protected
}
self.local = Remote(project, sect)
dvc/remote/__init__.py
+4 -7
View File
@@ -14,14 +14,11 @@ REMOTES = [RemoteHDFS, RemoteSSH, RemoteS3, RemoteGS, RemoteAzure, RemoteLOCAL]
def supported_url(url):
config = {Config.SECTION_REMOTE_URL: url}
for r in REMOTES:
if r.supported(config):
return True
return False
return any(remote.supported(config) for remote in REMOTES)
def Remote(project, config):
for r in REMOTES:
if r.supported(config):
return r(project, config)
for remote in REMOTES:
if remote.supported(config):
return remote(project, config)
raise UnsupportedRemoteError(str(config))