mister-devel/Distribution_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/Distribution_MiSTer.git synced 2026-05-17 03:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

On external files, size, md5hash could now be omitted

Browse Source
This commit is contained in:
José Manuel Barroso Galindo
2023-12-01 18:39:44 +01:00
committed by GitHub
parent a3c5946a43
commit 3565d4e33a
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.github/db_operator.py vendored
View File

@@ -168,10 +168,20 @@ class ExternalFilesReader:
return result
def _parse_data_row(self, row, result: List[Tuple[Path, Dict[str, Any], List[str]]]) -> None:
if len(row) < 4:
if len(row) < 2:
print('Not enough columns in this row, skipping it.', row)
return
path, url, size, md5hash = row[0].strip(), row[1].strip(), row[2].strip(), row[3].strip().lower()
if len(row) == 2:
print('Hash and size columns are missing.', row)
path, url, size, md5hash = row[0].strip(), row[1].strip(), '', ''
elif len(row) == 3:
print('Hash column is missing.', row)
path, url, size, md5hash = row[0].strip(), row[1].strip(), row[2].strip(), ''
else:
path, url, size, md5hash = row[0].strip(), row[1].strip(), row[2].strip(), row[3].strip().lower()
if size == '' or md5hash == '':
size, md5hash = self._read_size_and_md5hash_from_real_file(url, size, md5hash)
if not is_valid_path(path):
print(f"Invalid path in this row: {path}, skipping it.", row)
@@ -195,6 +205,16 @@ class ExternalFilesReader:
result.append((Path(path), description, filter_terms))
def _read_size_and_md5hash_from_real_file(self, url: str, size: str, md5hash: str) -> Tuple[str, str]:
with tempfile.NamedTemporaryFile() as tmp_file:
download_file(url, tmp_file.name)
new_size, new_md5hash = file_size(tmp_file.name), file_hash(tmp_file.name)
if size != '' and size != new_size:
print(f'Real size {new_size} is different than anotated size {size}')
if md5hash != '' and md5hash != new_md5hash:
print(f'Real MD5 Hash {new_md5hash} is different than anotated MD5 Hash {md5hash}')
return new_size, new_md5hash
@staticmethod
def _extract_filter_terms(row: List[str]) -> List[str]:
filter_terms = []