Skip to content

Rename the metadata file to match the saved best #1

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

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

Rename the metadata file to match the saved best #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5257bee
Rename the metadata file to match the saved best
drnay Dec 22, 2021
1790d71
Also rename the metadata file in the 'ignore' mode
drnay Dec 23, 2021
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,6 @@ ENV/

# mypy
.mypy_cache/

# vscode
.vscode/
28 changes: 21 additions & 7 deletions plugins/togo/tivodownload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import time
import struct
import sys
from operator import itemgetter
from functools import reduce
from threading import Thread
from datetime import datetime
Expand Down Expand Up @@ -302,12 +303,19 @@ def get_1st_queued_file(self):
if not retry_download:
with lock:
status['finished'] = True
best_attempt = status['download_attempts'][status['best_attempt_index']]
best_error_count = best_attempt['error_packet_count']
# if rejected everything, do not handle the best attempt
best_attempt = status['download_attempts'][status['best_attempt_index']] if status['best_file'] else None
best_error_count = best_attempt['error_packet_count'] if best_attempt else 0
best_file = status['best_file']

self.write_syncerr_log()

if best_error_count > 0:
if save_fn:
new_save_fn = best_file + '.txt'
os.rename(save_fn, new_save_fn)
logger.debug('Metadata TXT file renamed: %s', new_save_fn)

best_error_packets = best_attempt['error_packets']
logger.info('[{timestamp:%d/%b/%Y %H:%M:%S}] Done (with errors: '
'{epackets} packets in {esections} pieces (largest: {elargest}); '
Expand Down Expand Up @@ -470,10 +478,16 @@ def write_syncerr_log(self):
tivo_name = self.tivo_tasks['tivo_name']
outfile = status['outfile']
download_attempts = status['download_attempts']
best_ndx = status['best_attempt_index']
best_attempt = download_attempts[best_ndx]
best_file = status['best_file']
if best_file:
best_attempt_number = status['best_attempt_index'] + 1
best_attempt = download_attempts[best_attempt_number - 1]
best_size = best_attempt['size']
else:
best_attempt_number = None
best_size = None
best_attempt = min(download_attempts, key=itemgetter('error_packet_count'))

best_size = best_attempt['size']
best_start_time = best_attempt['start_time']
best_error_packet_count = best_attempt['error_packet_count']

Expand All @@ -491,11 +505,11 @@ def write_syncerr_log(self):
txt_f.write('%YAML 1.2\n---\n')

# General Info
txt_f.write('{:<20}: "{}"\n'.format('fileName', os.path.split(outfile)[1]))
txt_f.write('{:<20}: "{}"\n'.format('fileName', best_file))
txt_f.write('{:<20}: {}\n'.format('fileSize', best_size))
txt_f.write('{:<20}: {} ({})\n'.format('tivoName', tivo_name, self.tivoIP))
txt_f.write('{:<20}: {:%Y-%m-%dT%H:%M:%SZ}\n'.format('downloadStarted', datetime.utcfromtimestamp(best_start_time)))
txt_f.write('{:<20}: {}\n'.format('attemptSaved', best_ndx + 1))
txt_f.write('{:<20}: {}\n'.format('attemptSaved', best_attempt_number))
txt_f.write('{:<20}: {}\n'.format('totalErrorPackets', best_error_packet_count))

# download attempts
Expand Down