mirror of
https://github.com/azaion/annotations.git
synced 2026-04-22 10:46:30 +00:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -34,24 +34,25 @@ class CDNManager:
|
||||
print(e)
|
||||
return False
|
||||
|
||||
def download(self, bucket: str, filename: str):
|
||||
def download(self, folder: str, filename: str):
|
||||
try:
|
||||
if filename is not None:
|
||||
self.download_client.download_file(bucket, filename, os.path.join(bucket, filename))
|
||||
print(f'downloaded {filename} from the {bucket} to current folder')
|
||||
self.download_client.download_file(folder, filename, f'{folder}\\{filename}')
|
||||
print(f'downloaded {filename} from the {folder} to current folder')
|
||||
return True
|
||||
else:
|
||||
response = self.download_client.list_objects_v2(Bucket=bucket)
|
||||
response = self.download_client.list_objects_v2(Bucket=folder)
|
||||
if 'Contents' in response:
|
||||
for obj in response['Contents']:
|
||||
object_key = obj['Key']
|
||||
local_filepath = os.path.join(bucket, object_key)
|
||||
local_filepath = os.path.join(folder, object_key)
|
||||
local_dir = os.path.dirname(local_filepath)
|
||||
if local_dir:
|
||||
os.makedirs(local_dir, exist_ok=True)
|
||||
|
||||
if not object_key.endswith('/'):
|
||||
try:
|
||||
self.download_client.download_file(bucket, object_key, local_filepath)
|
||||
self.download_client.download_file(folder, object_key, local_filepath)
|
||||
except Exception as e_file:
|
||||
all_successful = False # Mark as failed if any file fails
|
||||
return True
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
[Setup]
|
||||
AppId={{CCFEC8E2-0FCC-4B03-8EEA-00AF20D265E5}}
|
||||
AppName=Azaion Suite
|
||||
AppVersion=1.4.5
|
||||
AppVersion=1.4.6
|
||||
AppPublisher=Azaion Ukraine
|
||||
DefaultDirName={localappdata}\Azaion\Azaion Suite
|
||||
DefaultGroupName=Azaion Suite
|
||||
OutputDir=..\
|
||||
OutputBaseFilename=AzaionSuite.Full.1.4.5
|
||||
OutputBaseFilename=AzaionSuite.Full.1.4.6
|
||||
SetupIconFile=..\dist-azaion\logo.ico
|
||||
UninstallDisplayName=Azaion Suite
|
||||
UninstallDisplayIcon={app}\Azaion.Suite.exe
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
[Setup]
|
||||
AppId={{CCFEC8E2-0FCC-4B03-8EEA-00AF20D265E5}}
|
||||
AppName=Azaion Suite
|
||||
AppVersion=1.4.5
|
||||
AppVersion=1.4.6
|
||||
AppPublisher=Azaion Ukraine
|
||||
DefaultDirName={localappdata}\Azaion\Azaion Suite
|
||||
DefaultGroupName=Azaion Suite
|
||||
OutputDir=..\
|
||||
OutputBaseFilename=AzaionSuite.Iterative.1.4.5
|
||||
OutputBaseFilename=AzaionSuite.Iterative.1.4.6
|
||||
SetupIconFile=..\dist-azaion\logo.ico
|
||||
UninstallDisplayName=Azaion Suite
|
||||
UninstallDisplayIcon={app}\Azaion.Suite.exe
|
||||
|
||||
@@ -12,7 +12,6 @@ call ..\gps-denied\image-matcher\build_gps
|
||||
call build\download_models
|
||||
|
||||
echo building installer...
|
||||
iscc build\installer.full.iss
|
||||
iscc build\installer.iterative.iss
|
||||
|
||||
popd
|
||||
Reference in New Issue
Block a user