voussoir/ycdl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't sort channels from get_channels, use get_things.

Browse source
This commit is contained in:
voussoir 2021-06-04 20:35:17 -07:00
parent 00917f585e
commit c74b9523e4
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontends/ycdl_flask/templates/channels.html
View file

@ -48,7 +48,7 @@
</div>
<div id="channels">
{% for channel in channels %}
{% for channel in channels|sort(attribute='name', case_sensitive=False) %}
{% if channel.has_pending() %}
<div class="channel_card_pending">
{% else %}

19
ycdl/ycdldb.py
View file

@ -93,6 +93,19 @@ class YCDLDBCacheManagerMixin:
thing_cache[thing_id] = thing
return thing
def get_things(self, thing_type):
'''
Yield things, unfiltered, in whatever order they appear in the database.
'''
thing_map = self._THING_CLASSES[thing_type]
table = thing_map['class'].table
query = f'SELECT * FROM {table}'
things = self.sql_select(query)
for thing_row in things:
thing = self.get_cached_instance(thing_type, thing_row)
yield thing
def get_things_by_sql(self, thing_type, query, bindings=None):
'''
Use an arbitrary SQL query to select things from the database.
@ -153,11 +166,7 @@ class YCDLDBChannelMixin:
return self.get_thing_by_id('channel', channel_id)
def get_channels(self):
query = 'SELECT * FROM channels'
rows = self.sql_select(query)
channels = [self.get_cached_instance('channel', row) for row in rows]
channels.sort(key=lambda c: c.name.lower())
return channels
return self.get_things(thing_type='channel')
def get_channels_by_sql(self, query, bindings=None):
return self.get_things_by_sql('channel', query, bindings)