various finetuning, RC, #build

Changed:
- Added auto tag to download queue item
- Add filesystem rescan before stream extract migration
- Add channel tags to search results
- Fix migration notification logic
- Fix filesystem rescan without task
This commit is contained in:
simon 2023-05-07 20:59:19 +07:00
commit e94e11c456
7 changed files with 41 additions and 21 deletions

View File

@ -11,6 +11,7 @@ from django.core.management.base import BaseCommand, CommandError
from home.src.es.connect import ElasticWrap, IndexPaginate
from home.src.es.index_setup import ElasitIndexWrap
from home.src.es.snapshot import ElasticSnapshot
from home.src.index.filesystem import Filesystem
from home.src.index.video_streams import MediaStreamExtractor
from home.src.ta.config import AppConfig, ReleaseVersion
from home.src.ta.helper import clear_dl_cache
@ -162,6 +163,8 @@ class Command(BaseCommand):
self.stdout.write(" no videos need updating")
return
self.stdout.write(" start filesystem rescan")
Filesystem().process()
total = len(all_missing)
for idx, missing in enumerate(all_missing):
media_url = missing["media_url"]
@ -201,17 +204,17 @@ class Command(BaseCommand):
response, status_code = ElasticWrap(path).post(data=data)
if status_code == 200:
updated = response.get("updated", 0)
if not updated:
if updated:
self.stdout.write(
self.style.SUCCESS(
f"{updated} videos updated in ta_download"
)
)
else:
self.stdout.write(
" no videos needed updating in ta_download"
)
return
self.stdout.write(
self.style.SUCCESS(
f"{updated} videos updated in ta_download"
)
)
return
message = " 🗙 ta_download auto_start update failed"
self.stdout.write(self.style.ERROR(message))

View File

@ -391,6 +391,7 @@ class QueryBuilder:
"channel_name._2gram^2",
"channel_name._3gram^2",
"channel_name.search_as_you_type^2",
"channel_tags",
],
}
}

View File

@ -47,13 +47,13 @@ class YoutubeChannel(YouTubeItem):
if not self.youtube_meta and fallback:
self._video_fallback(fallback)
else:
self._process_youtube_meta()
self.process_youtube_meta()
self.get_channel_art()
if upload:
self.upload_to_es()
def _process_youtube_meta(self):
def process_youtube_meta(self):
"""extract relevant fields"""
self.youtube_meta["thumbnails"].reverse()
channel_subs = self.youtube_meta.get("channel_follower_count") or 0

View File

@ -127,7 +127,8 @@ class Filesystem(ScannerBase):
def process(self):
"""entry point"""
self.task.send_progress(["Scanning your archive and index."])
if self.task:
self.task.send_progress(["Scanning your archive and index."])
self.scan()
self.rename_files()
self.send_mismatch_bulk()
@ -140,7 +141,8 @@ class Filesystem(ScannerBase):
return
total = len(self.to_rename)
self.task.send_progress([f"Rename {total} media files."])
if self.task:
self.task.send_progress([f"Rename {total} media files."])
for bad_filename in self.to_rename:
channel, filename, expected_filename = bad_filename
print(f"renaming [{filename}] to [{expected_filename}]")
@ -154,7 +156,8 @@ class Filesystem(ScannerBase):
return
total = len(self.mismatch)
self.task.send_progress([f"Fix media urls for {total} files"])
if self.task:
self.task.send_progress([f"Fix media urls for {total} files"])
bulk_list = []
for video_mismatch in self.mismatch:
youtube_id, media_url = video_mismatch
@ -174,7 +177,8 @@ class Filesystem(ScannerBase):
return
total = len(self.to_delete)
self.task.send_progress([f"Clean up {total} items from index."])
if self.task:
self.task.send_progress([f"Clean up {total} items from index."])
for indexed in self.to_delete:
youtube_id = indexed[0]
print(f"deleting {youtube_id} from index")

View File

@ -331,23 +331,29 @@ class Reindex(ReindexBase):
@staticmethod
def _reindex_single_channel(channel_id):
"""refresh channel data and sync to videos"""
# read current state
channel = YoutubeChannel(channel_id)
channel.get_from_es()
subscribed = channel.json_data["channel_subscribed"]
overwrites = channel.json_data.get("channel_overwrites", False)
es_meta = channel.json_data.copy()
# get new
channel.get_from_youtube()
if not channel.json_data:
if not channel.youtube_meta:
channel.deactivate()
channel.get_from_es()
channel.sync_to_videos()
return
channel.json_data["channel_subscribed"] = subscribed
channel.process_youtube_meta()
channel.get_channel_art()
# add back
channel.json_data["channel_subscribed"] = es_meta["channel_subscribed"]
overwrites = es_meta.get("channel_overwrites")
if overwrites:
channel.json_data["channel_overwrites"] = overwrites
channel.upload_to_es()
channel.sync_to_videos()
channel.upload_to_es()
ChannelFullScan(channel_id).scan()
def _reindex_single_playlist(self, playlist_id):

View File

@ -81,6 +81,9 @@
<span>queued</span>
{% endif %}
<span>{{ video.source.vid_type }}</span>
{% if video.source.auto_start %}
<span>auto</span>
{% endif %}
</div>
</div>
</div>

View File

@ -413,7 +413,10 @@ class DownloadView(ArchivistResultsView):
self.data.update(
{
"query": {"bool": {"must": must_list}},
"sort": [{"timestamp": {"order": "asc"}}],
"sort": [
{"auto_start": {"order": "desc"}},
{"timestamp": {"order": "asc"}},
],
}
)