heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subscriptions: Update live/upcoming/premier durations upon check

Browse Source 
The durations were previously set to "LIVE", "UPCOMING", etc. and
would not be updated once the livestream was over or the upcoming
video was published.
This commit is contained in:
Astound 2024-01-22 06:14:32 +08:00
parent 86bb312d6d
commit 2463af7685
Signed by: kaiser
GPG Key ID: 97504AF0027B1A56
1 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
youtube/subscriptions.py
View File

@ -108,8 +108,7 @@ def _subscribe(channels):
with connection as cursor: with connection as cursor:
channel_ids_to_check = [channel[0] for channel in channels if not _is_subscribed(cursor, channel[0])] channel_ids_to_check = [channel[0] for channel in channels if not _is_subscribed(cursor, channel[0])]
rows = ((channel_id, channel_name, 0, 0) for channel_id, rows = ((channel_id, channel_name, 0, 0) for channel_id, channel_name in channels)
channel_name in channels)
cursor.executemany('''INSERT OR IGNORE INTO subscribed_channels (yt_channel_id, channel_name, time_last_checked, next_check_time) cursor.executemany('''INSERT OR IGNORE INTO subscribed_channels (yt_channel_id, channel_name, time_last_checked, next_check_time)
VALUES (?, ?, ?, ?)''', rows) VALUES (?, ?, ?, ?)''', rows)
@ -236,8 +235,7 @@ def _get_channel_names(cursor, channel_ids):
return result return result
def _channels_with_tag(cursor, tag, order=False, exclude_muted=False, def _channels_with_tag(cursor, tag, order=False, exclude_muted=False, include_muted_status=False):
include_muted_status=False):
''' returns list of (channel_id, channel_name) ''' ''' returns list of (channel_id, channel_name) '''
statement = '''SELECT yt_channel_id, channel_name''' statement = '''SELECT yt_channel_id, channel_name'''
@ -434,8 +432,10 @@ def autocheck_setting_changed(old_value, new_value):
stop_autocheck_system() stop_autocheck_system()
settings.add_setting_changed_hook('autocheck_subscriptions', settings.add_setting_changed_hook(
autocheck_setting_changed) 'autocheck_subscriptions',
autocheck_setting_changed
)
if settings.autocheck_subscriptions: if settings.autocheck_subscriptions:
start_autocheck_system() start_autocheck_system()
# ---------------------------- # ----------------------------
@ -574,7 +574,6 @@ def _get_upstream_videos(channel_id):
video_item['time_published'] = youtube_timestamp_to_posix(video_item['time_published']) - i # subtract a few seconds off the videos so they will be in the right order video_item['time_published'] = youtube_timestamp_to_posix(video_item['time_published']) - i # subtract a few seconds off the videos so they will be in the right order
except Exception: except Exception:
print(video_item) print(video_item)
else: else:
video_item['is_time_published_exact'] = False video_item['is_time_published_exact'] = False
video_item['time_published'] = None video_item['time_published'] = None
@ -601,7 +600,6 @@ def _get_upstream_videos(channel_id):
# 1 month between videos # 1 month between videos
videos[i]['time_published'] = now - i*3600*24*30 videos[i]['time_published'] = now - i*3600*24*30
video_item['channel_id'] = channel_id
if len(videos) == 0: if len(videos) == 0:
average_upload_period = 4*7*24*3600 # assume 1 month for channel with no videos average_upload_period = 4*7*24*3600 # assume 1 month for channel with no videos
@ -620,26 +618,31 @@ def _get_upstream_videos(channel_id):
with open_database() as connection: with open_database() as connection:
with connection as cursor: with connection as cursor:
# calculate how many new videos there are # Get video ids and duration of existing vids so we
existing_vids = set(row[0] for row in cursor.execute( # can see how many new ones there are and update
'''SELECT video_id # livestreams/premiers
existing_vids = list(cursor.execute(
'''SELECT video_id, duration
FROM videos FROM videos
INNER JOIN subscribed_channels INNER JOIN subscribed_channels
ON videos.sql_channel_id = subscribed_channels.id ON videos.sql_channel_id = subscribed_channels.id
WHERE yt_channel_id=? WHERE yt_channel_id=?
ORDER BY time_published DESC ORDER BY time_published DESC
LIMIT 30''', [channel_id]).fetchall()) LIMIT 30''', [channel_id]).fetchall())
existing_vid_ids = set(row[0] for row in existing_vids)
existing_durs = dict(existing_vids)
# new videos the channel has uploaded since last time we checked # new videos the channel has uploaded since last time we checked
number_of_new_videos = 0 number_of_new_videos = 0
for video in videos: for video in videos:
if video['id'] in existing_vids: if video['id'] in existing_vid_ids:
break break
number_of_new_videos += 1 number_of_new_videos += 1
is_first_check = cursor.execute('''SELECT time_last_checked FROM subscribed_channels WHERE yt_channel_id=?''', [channel_id]).fetchone()[0] in (None, 0) is_first_check = cursor.execute('''SELECT time_last_checked FROM subscribed_channels WHERE yt_channel_id=?''', [channel_id]).fetchone()[0] in (None, 0)
time_videos_retrieved = int(time.time()) time_videos_retrieved = int(time.time())
rows = [] rows = []
update_rows = []
for i, video_item in enumerate(videos): for i, video_item in enumerate(videos):
if (is_first_check if (is_first_check
or number_of_new_videos > 6 or number_of_new_videos > 6
@ -655,6 +658,24 @@ def _get_upstream_videos(channel_id):
time_noticed = video_item['time_published'] time_noticed = video_item['time_published']
else: else:
time_noticed = time_videos_retrieved time_noticed = time_videos_retrieved
# videos which need durations updated
non_durations = ('upcoming', 'none', 'live', '')
v_id = video_item['id']
if (existing_durs.get(v_id) is not None
and existing_durs[v_id].lower() in non_durations
and video_item['duration'] not in non_durations
):
update_rows.append((
video_item['title'],
video_item['duration'],
video_item['time_published'],
video_item['is_time_published_exact'],
video_item['description'],
video_item['id'],
))
# all other videos
else:
rows.append(( rows.append((
video_item['channel_id'], video_item['channel_id'],
video_item['id'], video_item['id'],
@ -677,6 +698,13 @@ def _get_upstream_videos(channel_id):
description description
) )
VALUES ((SELECT id FROM subscribed_channels WHERE yt_channel_id=?), ?, ?, ?, ?, ?, ?, ?)''', rows) VALUES ((SELECT id FROM subscribed_channels WHERE yt_channel_id=?), ?, ?, ?, ?, ?, ?, ?)''', rows)
cursor.executemany('''UPDATE videos SET
title=?,
duration=?,
time_published=?,
is_time_published_exact=?,
description=?
WHERE video_id=?''', update_rows)
cursor.execute('''UPDATE subscribed_channels cursor.execute('''UPDATE subscribed_channels
SET time_last_checked = ?, next_check_time = ? SET time_last_checked = ?, next_check_time = ?
WHERE yt_channel_id=?''', [int(time.time()), next_check_time, channel_id]) WHERE yt_channel_id=?''', [int(time.time()), next_check_time, channel_id])
@ -809,7 +837,7 @@ def import_subscriptions():
error = 'Unsupported file format: ' + mime_type error = 'Unsupported file format: ' + mime_type
error += (' . Only subscription.json, subscriptions.csv files' error += (' . Only subscription.json, subscriptions.csv files'
' (from Google Takeouts)' ' (from Google Takeouts)'
' and XML OPML files exported from Youtube\'s' ' and XML OPML files exported from YouTube\'s'
' subscription manager page are supported') ' subscription manager page are supported')
return (flask.render_template('error.html', error_message=error), return (flask.render_template('error.html', error_message=error),
400) 400)
@ -1004,7 +1032,8 @@ def get_subscriptions_page():
'muted': muted, 'muted': muted,
}) })
return flask.render_template('subscriptions.html', return flask.render_template(
'subscriptions.html',
header_playlist_names=local_playlist.get_playlist_names(), header_playlist_names=local_playlist.get_playlist_names(),
videos=videos, videos=videos,
num_pages=math.ceil(number_of_videos_in_db/60), num_pages=math.ceil(number_of_videos_in_db/60),