1580158
/
sd-model-organizer
mirror of https://github.com/alexandersokol/sd-model-organizer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from harukaxxxx/fix/sort-by-name 

🐞 fix(utils): fix sort by name
pull/92/head
Alexander Sokol 2024-02-21 21:01:23 +02:00 committed by GitHub
parent a62b9ad21f d521ac89a3
commit 166bad201f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/mo/data/record_utils.py
View File

@ -19,9 +19,9 @@ def _sort_records(records: List, sort_order: ModelSort, sort_downloaded_first: b
reverse=True)
elif sort_order == ModelSort.NAME_ASC:
sorted_records = sorted(records,
key=lambda r: (not (bool(r.location) and os.path.exists(r.location)), r.name))
key=lambda r: (not (bool(r.location) and os.path.exists(r.location)), r.name.lower()))
elif sort_order == ModelSort.NAME_DESC:
sorted_records = sorted(records, key=lambda r: (bool(r.location) and os.path.exists(r.location), r.name),
sorted_records = sorted(records, key=lambda r: (bool(r.location) and os.path.exists(r.location), r.name.lower()),
reverse=True)
else:
raise ValueError(f'An unhandled sort_order value: {sort_order.value}')
@ -31,9 +31,9 @@ def _sort_records(records: List, sort_order: ModelSort, sort_downloaded_first: b
elif sort_order == ModelSort.TIME_ADDED_DESC:
sorted_records = sorted(records, key=lambda record: record.created_at, reverse=True)
elif sort_order == ModelSort.NAME_ASC:
sorted_records = sorted(records, key=lambda record: record.name)
sorted_records = sorted(records, key=lambda record: record.name.lower())
elif sort_order == ModelSort.NAME_DESC:
sorted_records = sorted(records, key=lambda record: record.name, reverse=True)
sorted_records = sorted(records, key=lambda record: record.name.lower(), reverse=True)
else:
raise ValueError(f'An unhandled sort_order value: {sort_order.value}')
return sorted_records