From 6fcfe5b3946ca9926496f863e02e6d637a538620 Mon Sep 17 00:00:00 2001 From: Tamas Kocsis Date: Thu, 29 Oct 2020 02:44:07 +0100 Subject: [PATCH] Rev4540, More proper bigfile filtering for OptionalFileList --- plugins/OptionalManager/UiWebsocketPlugin.py | 11 +++++++---- src/Config.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/OptionalManager/UiWebsocketPlugin.py b/plugins/OptionalManager/UiWebsocketPlugin.py index 103bbe84..0acc53cf 100644 --- a/plugins/OptionalManager/UiWebsocketPlugin.py +++ b/plugins/OptionalManager/UiWebsocketPlugin.py @@ -139,7 +139,7 @@ class UiWebsocketPlugin(object): wheres = {} wheres_raw = [] if "bigfile" in filter: - wheres["size >"] = 1024 * 1024 * 10 + wheres["size >"] = 1024 * 1024 * 1 if "downloaded" in filter: wheres_raw.append("(is_downloaded = 1 OR is_pinned = 1)") if "pinned" in filter: @@ -166,11 +166,14 @@ class UiWebsocketPlugin(object): row["address"] = address if row["size"] > 1024 * 1024: - has_info = self.addBigfileInfo(row) + has_bigfile_info = self.addBigfileInfo(row) else: - has_info = False + has_bigfile_info = False - if not has_info: + if not has_bigfile_info and "bigfile" in filter: + continue + + if not has_bigfile_info: if row["is_downloaded"]: row["bytes_downloaded"] = row["size"] row["downloaded_percent"] = 100 diff --git a/src/Config.py b/src/Config.py index b214de85..fb90e935 100644 --- a/src/Config.py +++ b/src/Config.py @@ -14,7 +14,7 @@ class Config(object): def __init__(self, argv): self.version = "0.7.2" - self.rev = 4539 + self.rev = 4540 self.argv = argv self.action = None self.test_parser = None