Skip to content

Commit e40eaf5

Browse files
authored
Skip uploading non-existent local files
Add check for existing local files before upload.
1 parent 747c78e commit e40eaf5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

modules/reporting/gcs.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ def _iter_files_to_upload(self, source_directory, exclude_dirs, exclude_files):
120120
continue
121121

122122
local_path = os.path.join(root, filename)
123+
if not os.path.exists(local_path):
124+
continue
123125
relative_path = os.path.relpath(local_path, source_directory)
124126
yield local_path, relative_path
125127

@@ -130,15 +132,13 @@ def upload_zip_archive(self, bucket, analysis_id, source_directory, exclude_dirs
130132
zip_name = "%s_tlp_%s.zip" % analysis_id, tlp
131133
else:
132134
zip_name = "%s.zip" % analysis_id
133-
134135
blob_name = zip_name
135136

136137
with tempfile.NamedTemporaryFile(delete=False, suffix=".zip") as tmp_zip_file:
137138
tmp_zip_file_name = tmp_zip_file.name
138139
with zipfile.ZipFile(tmp_zip_file, "w", zipfile.ZIP_DEFLATED) as archive:
139140
for local_path, relative_path in self._iter_files_to_upload(source_directory, exclude_dirs, exclude_files):
140141
archive.write(local_path, relative_path)
141-
142142
try:
143143
log.debug("Uploading '%s' to '%s'", tmp_zip_file_name, blob_name)
144144
blob = bucket.blob(blob_name)
@@ -153,7 +153,6 @@ def upload_files_individually(self, bucket, analysis_id, source_directory, exclu
153153
folder_name = analysis_id
154154
if tlp:
155155
folder_name = "%s_tlp_%s" % analysis_id, tlp
156-
157156
for local_path, relative_path in self._iter_files_to_upload(source_directory, exclude_dirs, exclude_files):
158157
blob_name = f"{folder_name}/{relative_path}"
159158
log.debug("Uploading '%s' to '%s'", local_path, blob_name)

0 commit comments

Comments
 (0)