这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix logging in multi-threaded conversion #1627

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

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Fix logging in multi-threaded conversion #1627

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6beeb2e
convert: Log file info after multi-threaded conversion has finished.
heinezen Feb 22, 2024
4704ec3
convert: Fix file size fetch when logging asset file info.
heinezen Feb 22, 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
28 changes: 10 additions & 18 deletions openage/convert/processor/export/media_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,6 @@ def error_callback(exception: Exception):
error_callback=error_callback
)

# Log file information
if get_loglevel() <= logging.DEBUG:
MediaExporter.log_fileinfo(
sourcedir[request.get_type().value, request.source_filename],
exportdir[request.targetdir, request.target_filename]
)

# Show progress
MediaExporter._show_progress(outqueue.qsize(), expected_size)

Expand All @@ -328,6 +321,14 @@ def error_callback(exception: Exception):
if handle_outqueue_func:
handle_outqueue_func(outqueue, requests)

# Log file information
if get_loglevel() <= logging.DEBUG:
for request in requests:
MediaExporter.log_fileinfo(
sourcedir[request.get_type().value, request.source_filename],
exportdir[request.targetdir, request.target_filename]
)

@staticmethod
def _get_blend_data(
request: MediaExportRequest,
Expand Down Expand Up @@ -607,17 +608,8 @@ def log_fileinfo(
source_format = source_file.suffix[1:].upper()
target_format = target_file.suffix[1:].upper()

source_path = source_file.resolve_native_path()
if source_path:
source_size = os.path.getsize(source_path)

else:
with source_file.open('r') as src:
src.seek(0, os.SEEK_END)
source_size = src.tell()

target_path = target_file.resolve_native_path()
target_size = os.path.getsize(target_path)
source_size = source_file.filesize
target_size = target_file.filesize

log = ("Converted: "
f"{source_file.name} "
Expand Down