From 4853a8b12bbaca309c86bb236998c55be03413eb Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 14 Apr 2022 16:18:08 +0700 Subject: [PATCH 01/11] limit video_daily to below 10k in daily refresh --- tubearchivist/home/src/index/reindex.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tubearchivist/home/src/index/reindex.py b/tubearchivist/home/src/index/reindex.py index b254c7f..ed29e89 100644 --- a/tubearchivist/home/src/index/reindex.py +++ b/tubearchivist/home/src/index/reindex.py @@ -41,6 +41,9 @@ class Reindex: """get daily refresh values""" total_videos = self._get_total_hits("ta_video") video_daily = ceil(total_videos / self.interval * self.MULTIPLY) + if video_daily >= 10000: + video_daily = 9999 + total_channels = self._get_total_hits("ta_channel") channel_daily = ceil(total_channels / self.interval * self.MULTIPLY) total_playlists = self._get_total_hits("ta_playlist") From 80c76c22ca629c1d2999193c8e523aec44ac475b Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 14 Apr 2022 16:49:27 +0700 Subject: [PATCH 02/11] add wiki documentation for sponsorblock integration --- docs/Channels.md | 3 ++- docs/Settings.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/Channels.md b/docs/Channels.md index b82c660..a091760 100644 --- a/docs/Channels.md +++ b/docs/Channels.md @@ -28,4 +28,5 @@ Each channel will get a dedicated channel detail page accessible at `/channel/ Date: Fri, 15 Apr 2022 15:03:43 +0700 Subject: [PATCH 03/11] guarantee stats in mapping for sort --- tubearchivist/home/src/es/index_mapping.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tubearchivist/home/src/es/index_mapping.json b/tubearchivist/home/src/es/index_mapping.json index 3abf2c1..9c33f72 100644 --- a/tubearchivist/home/src/es/index_mapping.json +++ b/tubearchivist/home/src/es/index_mapping.json @@ -193,6 +193,22 @@ } } }, + "stats" : { + "properties" : { + "average_rating" : { + "type" : "float" + }, + "dislike_count" : { + "type" : "long" + }, + "like_count" : { + "type" : "long" + }, + "view_count" : { + "type" : "long" + } + } + }, "subtitles": { "properties": { "ext": { From d4b1d97f5c5dcb28faf7daac59b4e52dc977f41a Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 15:16:31 +0700 Subject: [PATCH 04/11] add mappings for sponsorblock segments --- tubearchivist/home/src/es/index_mapping.json | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tubearchivist/home/src/es/index_mapping.json b/tubearchivist/home/src/es/index_mapping.json index 9c33f72..f023eef 100644 --- a/tubearchivist/home/src/es/index_mapping.json +++ b/tubearchivist/home/src/es/index_mapping.json @@ -245,6 +245,31 @@ }, "is_enabled": { "type": "boolean" + }, + "segments" : { + "properties" : { + "UUID" : { + "type": "keyword" + }, + "actionType" : { + "type": "keyword" + }, + "category" : { + "type": "keyword" + }, + "locked" : { + "type" : "short" + }, + "segment" : { + "type" : "float" + }, + "videoDuration" : { + "type" : "float" + }, + "votes" : { + "type" : "long" + } + } } } } From dc29c6718c92ec4c24cc955a917579aec6664a53 Mon Sep 17 00:00:00 2001 From: Ainsey11 Date: Fri, 15 Apr 2022 09:21:24 +0100 Subject: [PATCH 05/11] Fix: #210 - Download UI Box being removed when file is still processing (#219) * Fix: https://github.com/bbilly1/tubearchivist/issues/210 - Download UI element is removed when the file has finished downloading, but is still being moved on disk to the storage destination. This means the user is presented with nothing in the UI yet the file is still being processed. * FIX: Resolving linting issue * FIX: Set moving message to never expire and then a second message after the move with a 4 second expiry timer. Co-authored-by: Rob Ainsworth --- tubearchivist/home/src/download/yt_dlp_handler.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tubearchivist/home/src/download/yt_dlp_handler.py b/tubearchivist/home/src/download/yt_dlp_handler.py index 693d0e1..5f09907 100644 --- a/tubearchivist/home/src/download/yt_dlp_handler.py +++ b/tubearchivist/home/src/download/yt_dlp_handler.py @@ -181,7 +181,22 @@ class VideoDownloader: youtube_id, video_overwrites=self.video_overwrites ) self.channels.add(vid_dict["channel"]["channel_id"]) + mess_dict = { + "status": "message:download", + "level": "info", + "title": "Moving....", + "message": "Moving downloaded file to storage folder", + } + RedisArchivist().set_message("message:download", mess_dict, False) + self.move_to_archive(vid_dict) + mess_dict = { + "status": "message:download", + "level": "info", + "title": "Completed", + "message": "", + } + RedisArchivist().set_message("message:download", mess_dict, 4) self._delete_from_pending(youtube_id) # post processing From c5746089f5fdda6c5d57c43cfd68cec483fdd947 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 17:46:16 +0700 Subject: [PATCH 06/11] auto dedect new es version --- deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 0818e7a..38f7403 100755 --- a/deploy.sh +++ b/deploy.sh @@ -103,8 +103,9 @@ function validate { # update latest tag compatible es for set and forget function sync_latest_es { - printf "\nsync new es version:\n" - read -r VERSION + VERSION=$(grep "bbilly1/tubearchivist-es" docker-compose.yml | awk '{print $NF}') + printf "\nsync new ES version %s\nContinue?\n" "$VERSION" + read -rn 1 if [[ $(systemctl is-active docker) != 'active' ]]; then echo "starting docker" From 3d16954c79713f6fc34640511588b0324f733a05 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 17:56:17 +0700 Subject: [PATCH 07/11] change to tubearchivist-es, add comments --- docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a3ac505..89257f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,19 +11,19 @@ services: - media:/youtube - cache:/cache environment: - - ES_URL=http://archivist-es:9200 - - REDIS_HOST=archivist-redis + - ES_URL=http://archivist-es:9200 # needs protocol e.g. http and port + - REDIS_HOST=archivist-redis # don't add protocol - HOST_UID=1000 - HOST_GID=1000 - - TA_USERNAME=tubearchivist - - TA_PASSWORD=verysecret - - ELASTIC_PASSWORD=verysecret - - TZ=America/New_York + - TA_USERNAME=tubearchivist # your initial TA credentials + - TA_PASSWORD=verysecret # your initial TA credentials + - ELASTIC_PASSWORD=verysecret # set password for Elasticsearch + - TZ=America/New_York # set your time zone depends_on: - archivist-es - archivist-redis archivist-redis: - image: redislabs/rejson:latest # For arm64 just update this line with bbilly1/rejson:latest + image: redislabs/rejson:latest # for arm64 use bbilly1/rejson container_name: archivist-redis restart: always expose: @@ -33,12 +33,12 @@ services: depends_on: - archivist-es archivist-es: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1 + image: bbilly1/tubearchivist-es # only for amd64, or use official es 7.17.2 container_name: archivist-es restart: always environment: - "xpack.security.enabled=true" - - "ELASTIC_PASSWORD=verysecret" + - "ELASTIC_PASSWORD=verysecret" # matching Elasticsearch password - "discovery.type=single-node" - "ES_JAVA_OPTS=-Xms512m -Xmx512m" ulimits: @@ -46,7 +46,7 @@ services: soft: -1 hard: -1 volumes: - - es:/usr/share/elasticsearch/data + - es:/usr/share/elasticsearch/data # check for permission error when using bind mount, see readme expose: - "9200" From 7231b5d245f9800a44ada70cd4b1e780157cf837 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 20:03:15 +0700 Subject: [PATCH 08/11] implement unset of sb per channel overwrite --- docs/Channels.md | 2 +- tubearchivist/home/src/frontend/forms.py | 1 + tubearchivist/home/templates/home/channel_id.html | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/Channels.md b/docs/Channels.md index a091760..e6f7654 100644 --- a/docs/Channels.md +++ b/docs/Channels.md @@ -29,4 +29,4 @@ Clicking on the *Configure* button will open a form with options to configure se - **Download Format**: Overwrite the download qualities for videos from this channel. - **Auto Delete**: Automatically delete watched videos from this channel after selected days. - **Index Playlists**: Automatically add all Playlists with at least a video downloaded to your index. Only do this for channels where you care about playlists as this will slow down indexing new videos for having to check which playlist this belongs to. -- **SponsorBlock**: Using [SponsorBlock](https://sponsor.ajay.app/) to get and skip sponsored content. Customize per channel: You can disable or enable SponsorBlock for certain channels only to overwrite the behavior set on the [Settings](settings) page. \ No newline at end of file +- **SponsorBlock**: Using [SponsorBlock](https://sponsor.ajay.app/) to get and skip sponsored content. Customize per channel: You can *disable* or *enable* SponsorBlock for certain channels only to overwrite the behavior set on the [Settings](settings) page. Selecting *unset* will remove the overwrite and your setting will fall back to the default on the settings page. diff --git a/tubearchivist/home/src/frontend/forms.py b/tubearchivist/home/src/frontend/forms.py index 8709ff1..1a25e6a 100644 --- a/tubearchivist/home/src/frontend/forms.py +++ b/tubearchivist/home/src/frontend/forms.py @@ -202,6 +202,7 @@ class ChannelOverwriteForm(forms.Form): ("", "-- change sponsorblock integrations"), ("disable", "disable sponsorblock integration"), ("1", "enable sponsorblock integration"), + ("0", "unset sponsorblock integration"), ] download_format = forms.CharField(label=False, required=False) diff --git a/tubearchivist/home/templates/home/channel_id.html b/tubearchivist/home/templates/home/channel_id.html index a30b4f5..8240132 100644 --- a/tubearchivist/home/templates/home/channel_id.html +++ b/tubearchivist/home/templates/home/channel_id.html @@ -93,6 +93,8 @@

Enable SponsorBlock: {% if channel_info.channel_overwrites.integrate_sponsorblock %} {{ channel_info.channel_overwrites.integrate_sponsorblock }} + {% elif channel_info.channel_overwrites.integrate_sponsorblock == False %} + Disabled {% else %} False {% endif %}

From c84fbdfb9c251cfc9dff527b6f1e54f9ddc082cb Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 20:04:01 +0700 Subject: [PATCH 09/11] fix _check_get_sb for per channel deactivate --- tubearchivist/home/src/index/video.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tubearchivist/home/src/index/video.py b/tubearchivist/home/src/index/video.py index a58a0cb..b8adb9a 100644 --- a/tubearchivist/home/src/index/video.py +++ b/tubearchivist/home/src/index/video.py @@ -417,16 +417,15 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle): def _check_get_sb(self): """check if need to run sponsor block""" - integrate = False - if self.config["downloads"]["integrate_sponsorblock"]: - integrate = True + integrate = self.config["downloads"]["integrate_sponsorblock"] if self.video_overwrites: single_overwrite = self.video_overwrites.get(self.youtube_id) if not single_overwrite: return integrate - integrate = single_overwrite.get("integrate_sponsorblock", False) + if "integrate_sponsorblock" in single_overwrite: + return single_overwrite.get("integrate_sponsorblock") return integrate From 2fc4ed419e4fbc2344db463b12f21d78238cf169 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 20:07:59 +0700 Subject: [PATCH 10/11] add note about tubearchivist-es to readme --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1b80457..b22a505 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ Once your YouTube video collection grows, it becomes hard to search and find a specific video. That's where Tube Archivist comes in: By indexing your video collection with metadata from YouTube, you can organize, search and enjoy your archived YouTube videos without hassle offline through a convenient web interface. ## Connect -- [Discord](https://discord.gg/AFwz8nE7BK): Connect with us on our brand new Discord server. -- [r/TubeArchivist](https://www.reddit.com/r/TubeArchivist/): Join our brand new Subreddit. +- [Discord](https://discord.gg/AFwz8nE7BK): Connect with us on our Discord server. +- [r/TubeArchivist](https://www.reddit.com/r/TubeArchivist/): Join our Subreddit. ## Installing and updating Take a look at the example `docker-compose.yml` file provided. Use the *latest* or the named semantic version tag. The *unstable* tag is for intermediate testing and as the name implies, is **unstable** and not be used on your main installation but in a [testing environment](CONTRIBUTING.md). @@ -76,7 +76,9 @@ Should that not be an option, the Tube Archivist container takes these two addit Changing any of these two environment variables will change the files *nginx.conf* and *uwsgi.ini* at startup using `sed` in your container. ### Elasticsearch -**Note**: Newest Tube Archivist depends on Elasticsearch version 7.17 to provide an automatic updatepath. +**Note**: Newest Tube Archivist depends on Elasticsearch version 7.17 to provide an automatic updatepath in the future. + +Use `bbilly1/tubearchivist-es` to automatically get the recommended version, or use the official image with the version tag in the docker-compose file. Stores video meta data and makes everything searchable. Also keeps track of the download queue. - Needs to be accessible over the default port `9200` @@ -98,7 +100,7 @@ For some architectures it might be required to run Redis JSON on a nonstandard p ### Updating Tube Archivist You will see the current version number of **Tube Archivist** in the footer of the interface so you can compare it with the latest release to make sure you are running the *latest and greatest*. * There can be breaking changes between updates, particularly as the application grows, new environment variables or settings might be required for you to set in the your docker-compose file. *Always* check the **release notes**: Any breaking changes will be marked there. -* All testing and development is done with the Elasticsearch version number as mentioned in the provided *docker-compose.yml* file. This will be updated when a new release of Elasticsearch is available. Running an older version of Elasticsearch is most likely not going to result in any issues, but it's still recommended to run the same version as mentioned. +* All testing and development is done with the Elasticsearch version number as mentioned in the provided *docker-compose.yml* file. This will be updated when a new release of Elasticsearch is available. Running an older version of Elasticsearch is most likely not going to result in any issues, but it's still recommended to run the same version as mentioned. Use `bbilly1/tubearchivist-es` to automatically get the recommended version. ### Alternative installation instructions: - **arm64**: The Tube Archivist container is multi arch, so is Elasticsearch. RedisJSON doesn't offer arm builds, you can use `bbilly1/rejson`, an unofficial rebuild for arm64. From fe610fdacaf626d1f8d0fab3f9bffb5e150d95ba Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Apr 2022 20:41:38 +0700 Subject: [PATCH 11/11] add log output for backup progress --- tubearchivist/home/src/es/index_setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tubearchivist/home/src/es/index_setup.py b/tubearchivist/home/src/es/index_setup.py index cd408a0..85c4e28 100644 --- a/tubearchivist/home/src/es/index_setup.py +++ b/tubearchivist/home/src/es/index_setup.py @@ -377,6 +377,7 @@ def backup_all_indexes(reason): for index in backup_handler.index_config: index_name = index["index_name"] + print(f"backup: export in progress for {index_name}") if not backup_handler.index_exists(index_name): continue all_results = backup_handler.get_all_documents(index_name)