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

Jump to bottom

Duplication mitigations #112

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Duplication mitigations #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52ff059
Mitigation for duplicate ripping
shitwolfymakes Feb 10, 2022
d3f1fe0
Mitigation for duplicate ripping
shitwolfymakes Feb 10, 2022
15696df
Added logging
shitwolfymakes Feb 10, 2022
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 arm/ripper/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ def main(logfile, job):
identify.identify(job, logfile)
# Check db for entries matching the crc and successful
have_dupes, crc_jobs = utils.job_dupe_check(job)
logging.debug(f"Value of have_dupes: {have_dupes}")

utils.notify_entry(job)

Expand Down Expand Up @@ -218,6 +219,8 @@ def main(logfile, job):
logging.info(f"Handbrake Output directory \"{hb_out_path}\" already exists.")
# Only begin ripping if we are allowed to make duplicates
# Or the successful rip of the disc is not found in our database
logging.debug(f"Value of ALLOW_DUPLICATES: {0}".format(cfg["ALLOW_DUPLICATES"]))
logging.debug(f"Value of have_dupes: {have_dupes}")
if cfg["ALLOW_DUPLICATES"] or not have_dupes:
ts = round(time.time() * 100)
hb_out_path = hb_out_path + "_" + str(ts)
Expand Down
5 changes: 2 additions & 3 deletions arm/ripper/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,7 @@ def clean_old_jobs():

def job_dupe_check(job):
"""
function for checking the database to look for jobs that have completed
successfully with the same crc
function for checking the database to look for jobs with the same crc that haven't failed

:param job: The job obj so we can use the crc/title etc
:return: True if we have found dupes with the same crc
Expand All @@ -546,7 +545,7 @@ def job_dupe_check(job):
if job.crc_id is None:
return False, None
logging.debug(f"trying to find jobs with crc64={job.crc_id}")
previous_rips = m.Job.query.filter_by(crc_id=job.crc_id, status="success", hasnicetitle=True)
previous_rips = m.Job.query.filter(~m.Job.status.__contains__("fail"), crc_id=job.crc_id, hasnicetitle=True)
r = {}
i = 0
for j in previous_rips:
Expand Down
5 changes: 2 additions & 3 deletions arm/ui/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,7 @@ def get_omdb_poster(title=None, year=None, imdb_id=None, plot="short"):

def job_dupe_check(crc_id):
"""
function for checking the database to look for jobs that have completed
successfully with the same crc
function for checking the database to look for jobs with the same crc that haven't failed

:param crc_id: The job obj so we can use the crc/title etc
:return: True if we have found dupes with the same crc
Expand All @@ -434,7 +433,7 @@ def job_dupe_check(crc_id):
"""
if crc_id is None:
return False, None
jobs = Job.query.filter_by(crc_id=crc_id, status="success", hasnicetitle=True)
jobs = Job.query.filter(~Job.status.__contains__("fail"), crc_id=crc_id, hasnicetitle=True)
# app.logger.debug("search - posts=" + str(jobs))
r = {}
i = 0
Expand Down