Skip to content

Commit f0f8e0e

Browse files
committed
simplify bool conditions
1 parent d5d9cd3 commit f0f8e0e

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

tagstudio/src/cli/ts_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ def scr_browse_entries_gallery(self, index, clear_scr=True, refresh=True):
15561556

15571557
print(self.format_title(title))
15581558

1559-
if len(self.filtered_entries) > 0:
1559+
if self.filtered_entries:
15601560
# entry = self.lib.get_entry_from_index(
15611561
# self.filtered_entries[index])
15621562
entry = self.lib.get_entry(self.filtered_entries[index][1])
@@ -1581,7 +1581,7 @@ def scr_browse_entries_gallery(self, index, clear_scr=True, refresh=True):
15811581

15821582
self.print_fields(self.filtered_entries[index][1])
15831583
else:
1584-
if len(self.lib.entries) > 0:
1584+
if self.lib.entries:
15851585
print(self.format_h1('No Entry Results for Query', color=BRIGHT_RED_FG))
15861586
self.set_external_preview_default()
15871587
else:

tagstudio/src/core/library.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,17 +1367,17 @@ def search_library(self, query:str=None, entries=True, collations=True,
13671367
query: str = query.strip().lower()
13681368
query_words: list[str] = query.split(' ')
13691369
all_tag_terms: list[str] = []
1370-
only_untagged: bool = True if 'untagged' in query or 'no tags' in query else False
1371-
only_empty: bool = True if 'empty' in query or 'no fields' in query else False
1372-
only_missing: bool = True if 'missing' in query or 'no file' in query else False
1373-
allow_adv: bool = True if 'filename:' in query_words else False
1374-
tag_only: bool = True if 'tag_id:' in query_words else False
1370+
only_untagged: bool = ('untagged' in query or 'no tags' in query)
1371+
only_empty: bool = ('empty' in query or 'no fields' in query)
1372+
only_missing: bool = ('missing' in query or 'no file' in query)
1373+
allow_adv: bool = 'filename:' in query_words
1374+
tag_only: bool = 'tag_id:' in query_words
13751375
if allow_adv:
13761376
query_words.remove('filename:')
13771377
if tag_only:
13781378
query_words.remove('tag_id:')
13791379
# TODO: Expand this to allow for dynamic fields to work.
1380-
only_no_author: bool = True if 'no author' in query or 'no artist' in query else False
1380+
only_no_author: bool = ('no author' in query or 'no artist' in query)
13811381

13821382
# Preprocess the Tag terms.
13831383
if query_words:
@@ -1400,7 +1400,7 @@ def search_library(self, query:str=None, entries=True, collations=True,
14001400
# non_entry_count = 0
14011401
# Iterate over all Entries =============================================================
14021402
for entry in self.entries:
1403-
allowed_ext: bool = False if os.path.splitext(entry.filename)[1][1:].lower() in self.ignored_extensions else True
1403+
allowed_ext: bool = os.path.splitext(entry.filename)[1][1:].lower() not in self.ignored_extensions
14041404
# try:
14051405
# entry: Entry = self.entries[self.file_to_library_index_map[self._source_filenames[i]]]
14061406
# print(f'{entry}')
@@ -1522,7 +1522,7 @@ def search_library(self, query:str=None, entries=True, collations=True,
15221522

15231523
for entry in self.entries:
15241524
added = False
1525-
allowed_ext: bool = False if os.path.splitext(entry.filename)[1][1:].lower() in self.ignored_extensions else True
1525+
allowed_ext: bool = os.path.splitext(entry.filename)[1][1:].lower() not in self.ignored_extensions
15261526
if allowed_ext:
15271527
for f in entry.fields:
15281528
if self.get_field_attr(f, 'type') == 'collation':
@@ -1963,7 +1963,7 @@ def add_generic_data_to_entry(self, data, entry_id: int):
19631963
matching: list[int] = self.search_tags(
19641964
tag.replace('_', ' ').replace('-', ' '), include_cluster=False, ignore_builtin=True, threshold=2, context=tags)
19651965
priority_field_index = -1
1966-
if len(matching) > 0:
1966+
if matching:
19671967

19681968
# NOTE: The following commented-out code enables the ability
19691969
# to prefer an existing built-in tag_box field to add to

tagstudio/src/qt/ts_qt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,10 +1421,9 @@ def select_file(self):
14211421
os.path.normpath(self.lib.library_dir))
14221422
qfd.setFileMode(QFileDialog.FileMode.ExistingFile)
14231423
qfd.setNameFilter("DupeGuru Files (*.dupeguru)")
1424-
filename = []
14251424
if qfd.exec_():
14261425
filename = qfd.selectedFiles()
1427-
if len(filename) > 0:
1426+
if filename:
14281427
self.set_filename(filename[0])
14291428

14301429
def set_filename(self, filename:str):

0 commit comments

Comments
 (0)