[sync] upload driver changed to s3
This commit is contained in:
1 parent
dbadbdafc3
commit
1bca661e13
4 files changed
+46
-54
No files matched your search
@@ -68,7 +68,7 @@ class Document(Model):
|
||||
self.__hash_keys = ['id', 'url']
|
||||
|
||||
self.__id_template: str = '{category}-{file}'
|
||||
self.__url_template: str = settings.document_url_template
|
||||
self.__url_template: str = 'https://art.shlisselburg.org/static/uploads/{file}'
|
||||
self.__url_preview_template: str = settings.document_url_preview_template
|
||||
|
||||
self.title = None
|
||||
@@ -121,11 +121,14 @@ class Document(Model):
|
||||
return None
|
||||
|
||||
async def upload(self):
|
||||
print('uploading to s3', self.file)
|
||||
|
||||
filepath = self.provider.get_local(self.file)
|
||||
name = os.path.basename(self.url)
|
||||
url = settings.document_url_upload_template.format(file=name)
|
||||
|
||||
await request.upload(url, filepath)
|
||||
o = 'uploads/{}'.format(name)
|
||||
await request.s3_put(o, filepath)
|
||||
# await request.upload(url, filepath)
|
||||
|
||||
def bake(self):
|
||||
return {
|
||||
|
||||
@@ -18,10 +18,6 @@ logger = logging.getLogger(settings.name + '.Image')
|
||||
store = collection(settings.collection_images)
|
||||
|
||||
|
||||
def get_upload_url(url):
|
||||
return os.path.join(settings.image_url_upload, os.path.basename(url))
|
||||
|
||||
|
||||
def default_url_factory(file, size, ext):
|
||||
url = settings.image_url_base + '{}-{}{}'
|
||||
return url.format(md5(file), size, ext.lower())
|
||||
@@ -115,11 +111,10 @@ class Image(Model):
|
||||
async def upload(self):
|
||||
if self.data:
|
||||
async def fn(i):
|
||||
url = get_upload_url(i['url'])
|
||||
file = i['file']
|
||||
filename = os.path.basename(file)
|
||||
|
||||
logger.info('Uploading to {}'.format(url))
|
||||
await request.upload(url, file)
|
||||
await request.s3_put('images/'+filename, file)
|
||||
|
||||
await asyncio.wait([fn(i) for i in self.data.values()])
|
||||
|
||||
|
||||
Reference in new issue
Block a user