Merge pull request #256 from bakerboy448/fix-maxratio

qbit nohardlinks fixes
This commit is contained in:
bobokun 2023-04-04 23:09:58 -04:00 committed by GitHub
commit e6b3642a72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View file

@ -41,7 +41,7 @@ repos:
- id: pyupgrade - id: pyupgrade
args: [--py3-plus] args: [--py3-plus]
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 23.1.0 rev: 23.3.0
hooks: hooks:
- id: black - id: black
language_version: python3 language_version: python3

View file

@ -1 +1 @@
3.5.0 3.5.1

View file

@ -547,7 +547,7 @@ class Qbt:
# If neither set, use 0 (no limit) # If neither set, use 0 (no limit)
min_seeding_time = 0 min_seeding_time = 0
if ( if (
tracker["min_seeding_time"] tracker["min_seeding_time"] is not None
and tracker["min_seeding_time"] >= nohardlinks[category]["min_seeding_time"] and tracker["min_seeding_time"] >= nohardlinks[category]["min_seeding_time"]
): ):
min_seeding_time = tracker["min_seeding_time"] min_seeding_time = tracker["min_seeding_time"]
@ -559,7 +559,7 @@ class Qbt:
# If both tracker and nohardlinks category setting is set, use the larger of the two # If both tracker and nohardlinks category setting is set, use the larger of the two
# If neither set, use -1 (no limit) # If neither set, use -1 (no limit)
max_ratio = -1 max_ratio = -1
if tracker["max_ratio"] and tracker["max_ratio"] >= nohardlinks[category]["max_ratio"]: if tracker["max_ratio"] is not None and tracker["max_ratio"] >= nohardlinks[category]["max_ratio"]:
max_ratio = tracker["max_ratio"] max_ratio = tracker["max_ratio"]
elif nohardlinks[category]["max_ratio"]: elif nohardlinks[category]["max_ratio"]:
max_ratio = nohardlinks[category]["max_ratio"] max_ratio = nohardlinks[category]["max_ratio"]
@ -570,13 +570,12 @@ class Qbt:
# If neither set, use -1 (no limit) # If neither set, use -1 (no limit)
max_seeding_time = -1 max_seeding_time = -1
if ( if (
tracker["max_seeding_time"] tracker["max_seeding_time"] is not None
and tracker["max_seeding_time"] >= nohardlinks[category]["max_seeding_time"] and tracker["max_seeding_time"] >= nohardlinks[category]["max_seeding_time"]
): ):
max_seeding_time = tracker["max_seeding_time"] max_seeding_time = tracker["max_seeding_time"]
elif nohardlinks[category]["max_seeding_time"]: elif nohardlinks[category]["max_seeding_time"]:
max_seeding_time = nohardlinks[category]["max_seeding_time"] max_seeding_time = nohardlinks[category]["max_seeding_time"]
# Will only tag new torrents that don't have nohardlinks_tag tag # Will only tag new torrents that don't have nohardlinks_tag tag
if self.config.nohardlinks_tag not in torrent.tags: if self.config.nohardlinks_tag not in torrent.tags:
add_tag_no_hl(add_tag=True) add_tag_no_hl(add_tag=True)