From 0f6bc3a420aa26f1827f49c1065fef9b59246651 Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 11 Dec 2022 15:56:44 +0700 Subject: [PATCH] refactor check_reindex task for ReindexManual --- tubearchivist/home/src/index/reindex.py | 6 ------ tubearchivist/home/tasks.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tubearchivist/home/src/index/reindex.py b/tubearchivist/home/src/index/reindex.py index 6c7b32d..f546f2d 100644 --- a/tubearchivist/home/src/index/reindex.py +++ b/tubearchivist/home/src/index/reindex.py @@ -351,12 +351,6 @@ class Reindex(ReindexBase): return valid -def reindex_outdated(): - """reindex all outdated""" - ReindexOutdated().add_outdated() - Reindex().reindex_all() - - class ChannelUrlFixer: """fix not matching channel names in reindex""" diff --git a/tubearchivist/home/tasks.py b/tubearchivist/home/tasks.py index ecadf8e..18ba2be 100644 --- a/tubearchivist/home/tasks.py +++ b/tubearchivist/home/tasks.py @@ -21,7 +21,7 @@ from home.src.es.backup import ElasticBackup from home.src.es.index_setup import ElasitIndexWrap from home.src.index.channel import YoutubeChannel from home.src.index.filesystem import ImportFolderScanner, scan_filesystem -from home.src.index.reindex import reindex_outdated +from home.src.index.reindex import Reindex, ReindexManual, ReindexOutdated from home.src.ta.config import AppConfig, ScheduleBuilder from home.src.ta.helper import UrlListParser, clear_dl_cache from home.src.ta.ta_redis import RedisArchivist, RedisQueue @@ -133,9 +133,14 @@ def extrac_dl(youtube_ids): @shared_task(name="check_reindex") -def check_reindex(): +def check_reindex(data=False, extract_videos=False): """run the reindex main command""" - reindex_outdated() + if data: + ReindexManual(extract_videos=extract_videos).extract_data(data) + else: + ReindexOutdated().add_outdated() + + Reindex().reindex_all() @shared_task