Fix error case in uploading tar, more comments
This commit is contained in:
parent
d6d0bb640a
commit
872be8605a
6 changed files with 37 additions and 17 deletions
|
@ -1,6 +1,7 @@
|
|||
import logging
|
||||
import yaml
|
||||
import io
|
||||
import os
|
||||
|
||||
from config_app.config_util.config.baseprovider import BaseProvider
|
||||
|
||||
|
@ -36,7 +37,7 @@ class InMemoryProvider(BaseProvider):
|
|||
return True
|
||||
|
||||
def volume_file_exists(self, filename):
|
||||
return any([ name.startswith(filename) for name in self.files ])
|
||||
return any([name.startswith(filename) for name in self.files])
|
||||
|
||||
def get_volume_file(self, filename, mode='r'):
|
||||
return io.BytesIO(self.files[filename])
|
||||
|
@ -53,7 +54,7 @@ class InMemoryProvider(BaseProvider):
|
|||
return string[string.rfind('/') + 1:]
|
||||
return string
|
||||
|
||||
return [ strip_directory(name) for name in self.files if name.startswith(path) ]
|
||||
return [strip_directory(name) for name in self.files if name.startswith(path)]
|
||||
|
||||
def save_volume_file(self, filename, flask_file):
|
||||
self.files[filename] = flask_file.read()
|
||||
|
@ -62,11 +63,7 @@ class InMemoryProvider(BaseProvider):
|
|||
raise Exception('Not implemented yet')
|
||||
|
||||
def get_volume_path(self, directory, filename):
|
||||
# Here we can just access the filename since we're storing the tarball files with their full path
|
||||
if directory.endswith('/'):
|
||||
return directory + filename
|
||||
else:
|
||||
return directory + '/' + filename
|
||||
return os.path.join(directory, filename)
|
||||
|
||||
def load_from_tarball(self, tarfile):
|
||||
for tarinfo in tarfile.getmembers():
|
||||
|
|
Reference in a new issue