rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 10:51:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Summarizing Channel size on Channels page, rather than info age.

Browse source
This commit is contained in:
Roland 2023-05-10 22:59:16 -06:00
parent f079263fad
commit 7c5caf1dfd
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/components/Channels.js
View file

@ -18,7 +18,6 @@ import {
DirectoryInput,
frequencyOptions,
humanFileSize,
isoDatetimeToString,
RequiredAsterisk,
secondsToFrequency,
Toggle,
@ -450,10 +449,10 @@ function ChannelRow({channel}) {
{channel.video_count}
</TableCell>
<TableCell>
{channel.url && channel.info_date ? isoDatetimeToString(channel.info_date) : null}
{channel.url && channel.download_frequency ? secondsToFrequency(channel.download_frequency) : null}
</TableCell>
<TableCell>
{channel.url && channel.download_frequency ? secondsToFrequency(channel.download_frequency) : null}
{channel.size ? humanFileSize(channel.size) : null}
</TableCell>
<TableCell textAlign='right'>
<Link className={buttonClass} to={editTo}>Edit</Link>
@ -520,8 +519,8 @@ export function Channels() {
const headers = [
{key: 'name', text: 'Name', sortBy: 'name', width: 8},
{key: 'video_count', text: 'Videos', sortBy: 'video_count', width: 2},
{key: 'last_update', text: 'Last Update', sortBy: 'info_date', width: 2},
{key: 'download_frequency', text: 'Download Frequency', sortBy: 'download_frequency', width: 2},
{key: 'size', text: 'Size', sortBy: 'size', width: 2},
{key: 'manage', text: 'Manage', width: 2},
];
const mobileHeaders = [

17
modules/videos/channel/lib.py
View file

@ -26,20 +26,17 @@ async def get_minimal_channels() -> List[dict]:
# Get all channels, even if they don't have videos.
stmt = '''
SELECT
c.id, name, directory, url, download_frequency, info_date,
(select next_download from download d where d.url=c.url) AS next_download
c.id, name, directory, c.url, download_frequency,
COUNT(v.id) as video_count,
SUM(fg.size)::BIGINT AS size
FROM
channel AS c
ORDER BY LOWER(name)
LEFT JOIN video v on c.id = v.channel_id
LEFT JOIN file_group fg on fg.id = v.file_group_id
GROUP BY 1, 2, 3, 4, 5
'''
curs.execute(stmt)
channels = list(map(dict, curs.fetchall()))
video_counts = await get_channels_video_count()
for channel in channels:
channel_id = channel['id']
channel['video_count'] = video_counts[channel_id]
channels = sorted([dict(i) for i in curs.fetchall()], key=lambda i: i['name'].lower())
return channels