Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix checking voice files in custom data dirs #367

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix checking voice files in custom data dirs #367

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b8e3b
Fix checking voice files in custom data dirs
ichthyosaurus Jan 29, 2024
d41e4ab
Ignore model files with wrong size/hash, don't delete
ichthyosaurus Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/python_run/piper/download.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,51 +58,55 @@ def ensure_voice_exists(
voice_info = voices_info[name]
voice_files = voice_info["files"]
files_to_download: Set[str] = set()
data_dirs = set([Path(x) for x in data_dirs])

for data_dir in data_dirs:
data_dir = Path(data_dir)
# Check sizes/hashes
for file_path, file_info in voice_files.items():
if file_path in files_to_download:
# Already planning to download
continue

# Check sizes/hashes
for file_path, file_info in voice_files.items():
if file_path in files_to_download:
# Already planning to download
continue
file_name = Path(file_path).name
if file_name in _SKIP_FILES:
continue

file_name = Path(file_path).name
if file_name in _SKIP_FILES:
continue
file_found = False

for data_dir in data_dirs:
data_file_path = data_dir / file_name
_LOGGER.debug("Checking %s", data_file_path)

if not data_file_path.exists():
_LOGGER.debug("Missing %s", data_file_path)
files_to_download.add(file_path)
continue

expected_size = file_info["size_bytes"]
actual_size = data_file_path.stat().st_size
if expected_size != actual_size:
_LOGGER.warning(
"Wrong size (expected=%s, actual=%s) for %s",
"Skipping model file with wrong size (expected=%s, actual=%s) for %s",
expected_size,
actual_size,
data_file_path,
)
files_to_download.add(file_path)
continue

expected_hash = file_info["md5_digest"]
actual_hash = get_file_hash(data_file_path)
if expected_hash != actual_hash:
_LOGGER.warning(
"Wrong hash (expected=%s, actual=%s) for %s",
"Skipping model file with wrong hash (expected=%s, actual=%s) for %s",
expected_hash,
actual_hash,
data_file_path,
)
files_to_download.add(file_path)
continue

file_found = True

if not file_found:
_LOGGER.debug("Missing %s", data_file_path)
files_to_download.add(file_path)

if (not voice_files) and (not files_to_download):
raise ValueError(f"Unable to find or download voice: {name}")

Expand Down