Don't sort channels from get_channels, use get_things.
This commit is contained in:
parent
00917f585e
commit
c74b9523e4
2 changed files with 15 additions and 6 deletions
|
@ -48,7 +48,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="channels">
|
<div id="channels">
|
||||||
{% for channel in channels %}
|
{% for channel in channels|sort(attribute='name', case_sensitive=False) %}
|
||||||
{% if channel.has_pending() %}
|
{% if channel.has_pending() %}
|
||||||
<div class="channel_card_pending">
|
<div class="channel_card_pending">
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -93,6 +93,19 @@ class YCDLDBCacheManagerMixin:
|
||||||
thing_cache[thing_id] = thing
|
thing_cache[thing_id] = thing
|
||||||
return 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):
|
def get_things_by_sql(self, thing_type, query, bindings=None):
|
||||||
'''
|
'''
|
||||||
Use an arbitrary SQL query to select things from the database.
|
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)
|
return self.get_thing_by_id('channel', channel_id)
|
||||||
|
|
||||||
def get_channels(self):
|
def get_channels(self):
|
||||||
query = 'SELECT * FROM channels'
|
return self.get_things(thing_type='channel')
|
||||||
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
|
|
||||||
|
|
||||||
def get_channels_by_sql(self, query, bindings=None):
|
def get_channels_by_sql(self, query, bindings=None):
|
||||||
return self.get_things_by_sql('channel', query, bindings)
|
return self.get_things_by_sql('channel', query, bindings)
|
||||||
|
|
Loading…
Reference in a new issue