From f0fba0644d4adb981f06f1a51cd9f258da9d7735 Mon Sep 17 00:00:00 2001
From: crocs <34723037+pairofcrocs@users.noreply.github.com>
Date: Mon, 4 Apr 2022 11:08:36 -0500
Subject: [PATCH 01/23] Create AlternativeInstallation.md
---
docs/AlternativeInstallation.md | 56 +++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 docs/AlternativeInstallation.md
diff --git a/docs/AlternativeInstallation.md b/docs/AlternativeInstallation.md
new file mode 100644
index 0000000..dae1d69
--- /dev/null
+++ b/docs/AlternativeInstallation.md
@@ -0,0 +1,56 @@
+# Alternative installation instructions
+
+## Unraid
+
+Tube Archivist, and all if it's dependencies are located in the [community applications](https://forums.unraid.net/topic/38582-plug-in-community-applications/) store. The three containers you will need are as follows:
+
+- **TubeArchivist-RedisJSON**: This container acts as a cache and temporary link between the application and the file system. Used to store and display messages and configuration variables.
+- **TubeArchivist-ES**: ElasticSearch stores video meta data and makes everything searchable. Also keeps track of the download queue.
+- **TubeArchivist**: 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.
+
+### Step 1: Install `TubeArchivist-RedisJSON`
+
+![enter image description here](https://i.imgur.com/ycAqFRU.png)
+This is the easiest container to setup of the thee, just make sure that you do not have any port conflicts, and that your `/data` is mounted to the correct path. The other containers will map to the same directory.
+
+If you need to install `TubeArchivist-RedisJSON`on a different port, you'll have to follow [these steps](https://github.com/bbilly1/tubearchivist#redis-on-a-custom-port) later on when installing the `TubeArchivist` container
+
+
+### Step 2: Install `TubeArchivist-ES`
+![enter image description here](https://i.imgur.com/o6tsTdt.png)
+ElasticSeach is also pretty easy to setup. Again, make sure you have no port conflicts, make sure that you mapped `/usr/share/elasticsearch/data` to the same directory as `RedisJSON`, and make sure to change the default password to something more secure.
+
+There is three additional settings in the "show more settings" area, but leave those as they are.
+
+
+### Step 3: Install `TubeArchivist`
+
+![enter image description here](https://i.imgur.com/dwSCfgO.png)
+It's finally time to set up TubeArchivist!
+
+ - `Port:`Again, make sure that you have no port conflicts on 8000.
+
+ - `Youtube Media Path:` is where you'll download all of your videos to.
+ Make sure that this is an empty directory to not cause confusion when
+ starting the application. If you have existing videos that you'd like
+ to import into Tube Archivist, please checkout the [settings
+ wiki.](https://github.com/bbilly1/tubearchivist/wiki/Settings#manual-media-files-import)
+
+
+- `Appdata:` This should be the same base path as the other two containers.
+
+ - `TA Username:`This will be your username for TubeArchivist.
+
+ - `TA Password:`This will be your password for TubeArchivist.
+
+ - `Redis` This will be JUST the ip address of your redis container
+
+ - `ElasticSearch Password:`This is the password you defined in the `TubeArchivist-ES` container.
+ - `ElasticSearch:` This seems to cause some confusion, but it's a pretty simple step, just replace the IP and Port to match you `TubeArchivist-ES` container.
+
+ (example: if your IP is 192.168.1.15, the value should be http://192.168.1.15:9200)
+
+ - `Time Zone:` This is an important step for your scheduler, to find your timezone, use a site like [TimeZoneConverter](http://www.timezoneconverter.com/cgi-bin/findzone.tzc)
+
+### From there, you should be able to start up your containers and you're good to go!
+If you're still having trouble, join us on [discord](https://discord.gg/AFwz8nE7BK) and come to the #unraid channel.
From e2f4dd124a89d3ab2bb3450a8c37a04e1bbf8256 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 15:15:37 +0700
Subject: [PATCH 02/23] bump beautifulsoup4
---
tubearchivist/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt
index af75bb3..1650ebd 100644
--- a/tubearchivist/requirements.txt
+++ b/tubearchivist/requirements.txt
@@ -1,4 +1,4 @@
-beautifulsoup4==4.10.0
+beautifulsoup4==4.11.0
celery==5.2.6
Django==4.0.3
django-cors-headers==3.11.0
From efa240440b14f925dce428b62638bee2c487d166 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 15:15:59 +0700
Subject: [PATCH 03/23] fix userspace for vide base config
---
tubearchivist/home/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py
index e7bd143..0cd2a58 100644
--- a/tubearchivist/home/views.py
+++ b/tubearchivist/home/views.py
@@ -111,7 +111,7 @@ class ArchivistViewConfig(View):
"""build default context for every view"""
self.user_id = user_id
self.user_conf = RedisArchivist()
- self.default_conf = AppConfig().config
+ self.default_conf = AppConfig(self.user_id).config
self.context = {
"colors": self.default_conf["application"]["colors"],
From fe3e3cfaccb80aa8d168761cc75da44faafba671 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 15:56:34 +0700
Subject: [PATCH 04/23] fix filenotfounderror for missing subtitles when
deleting video
---
tubearchivist/home/src/index/video.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tubearchivist/home/src/index/video.py b/tubearchivist/home/src/index/video.py
index 811059e..a728caf 100644
--- a/tubearchivist/home/src/index/video.py
+++ b/tubearchivist/home/src/index/video.py
@@ -498,7 +498,10 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
for media_url in to_del:
file_path = os.path.join(video_base, media_url)
- os.remove(file_path)
+ try:
+ os.remove(file_path)
+ except FileNotFoundError:
+ print(f"{self.youtube_id}: failed {media_url}, continue.")
self.del_in_es()
self.delete_subtitles()
From 365ebf53a5709c200118d74e753cc00e1a81783b Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 17:17:39 +0700
Subject: [PATCH 05/23] implement per channel sponsorblock
---
tubearchivist/home/src/es/index_mapping.json | 6 ++++++
tubearchivist/home/src/frontend/forms.py | 9 +++++++++
tubearchivist/home/src/index/channel.py | 7 ++++++-
tubearchivist/home/templates/home/channel_id.html | 10 +++++++++-
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/tubearchivist/home/src/es/index_mapping.json b/tubearchivist/home/src/es/index_mapping.json
index 0fddc11..9a0ee47 100644
--- a/tubearchivist/home/src/es/index_mapping.json
+++ b/tubearchivist/home/src/es/index_mapping.json
@@ -50,6 +50,9 @@
},
"index_playlists": {
"type": "boolean"
+ },
+ "integrate_sponsorblock": {
+ "type" : "boolean"
}
}
}
@@ -130,6 +133,9 @@
},
"index_playlists": {
"type": "boolean"
+ },
+ "integrate_sponsorblock": {
+ "type" : "boolean"
}
}
}
diff --git a/tubearchivist/home/src/frontend/forms.py b/tubearchivist/home/src/frontend/forms.py
index 53ef284..337a805 100644
--- a/tubearchivist/home/src/frontend/forms.py
+++ b/tubearchivist/home/src/frontend/forms.py
@@ -198,8 +198,17 @@ class ChannelOverwriteForm(forms.Form):
("1", "Enable playlist index"),
]
+ SP_CHOICES = [
+ ("", "-- change sponsorblock integrations"),
+ ("0", "disable sponsorblock integration"),
+ ("1", "enable sponsorblock integration"),
+ ]
+
download_format = forms.CharField(label=False, required=False)
autodelete_days = forms.IntegerField(label=False, required=False)
index_playlists = forms.ChoiceField(
widget=forms.Select, choices=PLAYLIST_INDEX, required=False
)
+ integrate_sponsorblock = forms.ChoiceField(
+ widget=forms.Select, choices=SP_CHOICES, required=False
+ )
diff --git a/tubearchivist/home/src/index/channel.py b/tubearchivist/home/src/index/channel.py
index 953078d..75824d8 100644
--- a/tubearchivist/home/src/index/channel.py
+++ b/tubearchivist/home/src/index/channel.py
@@ -340,7 +340,12 @@ class YoutubeChannel(YouTubeItem):
def set_overwrites(self, overwrites):
"""set per channel overwrites"""
- valid_keys = ["download_format", "autodelete_days", "index_playlists"]
+ valid_keys = [
+ "download_format",
+ "autodelete_days",
+ "index_playlists",
+ "integrate_sponsorblock",
+ ]
to_write = self.json_data.get("channel_overwrites", {})
for key, value in overwrites.items():
diff --git a/tubearchivist/home/templates/home/channel_id.html b/tubearchivist/home/templates/home/channel_id.html
index 80b090b..a30b4f5 100644
--- a/tubearchivist/home/templates/home/channel_id.html
+++ b/tubearchivist/home/templates/home/channel_id.html
@@ -89,7 +89,15 @@
{% endif %}
Integrate with returnyoutubedislike.com to get dislikes and average ratings back: {{ config.downloads.integrate_ryd }}
+
Integrate with returnyoutubedislike.com to get dislikes and average ratings back: {{ config.downloads.integrate_ryd }}
Before activating that, make sure you have a scraping sleep interval of at least 3 secs set to avoid ratelimiting issues.
{{ app_form.downloads_integrate_ryd }}
-
Integrate with SponsorBlock to get sponsored timestamps: {{ config.downloads.integrate_sponsorblock }}
+
Integrate with SponsorBlock to get sponsored timestamps: {{ config.downloads.integrate_sponsorblock }}
Before activating that, make sure you have a scraping sleep interval of at least 3 secs set to avoid ratelimiting issues.
{{ app_form.downloads_integrate_sponsorblock }}
From 9d73dbc45a2dfe990695003a7a52cd7f52f6d028 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 17:19:25 +0700
Subject: [PATCH 07/23] implement video overwrites index for sponsorblock
---
.../home/src/download/yt_dlp_handler.py | 4 +++-
tubearchivist/home/src/index/video.py | 22 +++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/tubearchivist/home/src/download/yt_dlp_handler.py b/tubearchivist/home/src/download/yt_dlp_handler.py
index d764011..693d0e1 100644
--- a/tubearchivist/home/src/download/yt_dlp_handler.py
+++ b/tubearchivist/home/src/download/yt_dlp_handler.py
@@ -177,7 +177,9 @@ class VideoDownloader:
except yt_dlp.utils.DownloadError:
print("failed to download " + youtube_id)
continue
- vid_dict = index_new_video(youtube_id)
+ vid_dict = index_new_video(
+ youtube_id, video_overwrites=self.video_overwrites
+ )
self.channels.add(vid_dict["channel"]["channel_id"])
self.move_to_archive(vid_dict)
self._delete_from_pending(youtube_id)
diff --git a/tubearchivist/home/src/index/video.py b/tubearchivist/home/src/index/video.py
index a728caf..28ad536 100644
--- a/tubearchivist/home/src/index/video.py
+++ b/tubearchivist/home/src/index/video.py
@@ -358,9 +358,10 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
index_name = "ta_video"
yt_base = "https://www.youtube.com/watch?v="
- def __init__(self, youtube_id):
+ def __init__(self, youtube_id, video_overwrites=False):
super().__init__(youtube_id)
self.channel_id = False
+ self.video_overwrites = video_overwrites
self.es_path = f"{self.index_name}/_doc/{youtube_id}"
def build_json(self):
@@ -377,11 +378,24 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
if self.config["downloads"]["integrate_ryd"]:
self._get_ryd_stats()
- if self.config["downloads"]["integrate_sponsorblock"]:
+ if self._check_get_sb():
self._get_sponsorblock()
return
+ def _check_get_sb(self):
+ """check if need to run sponsor block"""
+ if self.config["downloads"]["integrate_sponsorblock"]:
+ return True
+ try:
+ single_overwrite = self.video_overwrites[self.youtube_id]
+ _ = single_overwrite["integrate_sponsorblock"]
+ return True
+ except KeyError:
+ return False
+
+ return False
+
def _process_youtube_meta(self):
"""extract relevant fields from youtube"""
# extract
@@ -547,9 +561,9 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
_, _ = ElasticWrap(path).post(data=data)
-def index_new_video(youtube_id):
+def index_new_video(youtube_id, video_overwrites=False):
"""combined classes to create new video in index"""
- video = YoutubeVideo(youtube_id)
+ video = YoutubeVideo(youtube_id, video_overwrites=video_overwrites)
video.build_json()
if not video.json_data:
raise ValueError("failed to get metadata for " + youtube_id)
From 552636d8825a88734c8bf19d1f56071f22828254 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 17:55:24 +0700
Subject: [PATCH 08/23] handle 404 in video item API view
---
tubearchivist/api/views.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tubearchivist/api/views.py b/tubearchivist/api/views.py
index d938b2f..4ad216e 100644
--- a/tubearchivist/api/views.py
+++ b/tubearchivist/api/views.py
@@ -86,7 +86,8 @@ class VideoApiView(ApiBaseView):
# pylint: disable=unused-argument
"""get request"""
self.get_document(video_id)
- self.process_keys()
+ if self.response.get("data"):
+ self.process_keys()
return Response(self.response, status=self.status_code)
From 236215cc4c7ac6f0b328ede8981f370bda01e642 Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 22:10:16 +0700
Subject: [PATCH 09/23] add config var to video.html template
---
tubearchivist/home/views.py | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py
index 0cd2a58..92359b8 100644
--- a/tubearchivist/home/views.py
+++ b/tubearchivist/home/views.py
@@ -670,7 +670,7 @@ class VideoView(View):
def get(self, request, video_id):
"""get single video"""
- colors, cast = self.read_config(user_id=request.user.id)
+ config_handler = AppConfig(request.user.id)
path = f"ta_video/_doc/{video_id}"
look_up = SearchHandler(path, config=False)
video_hit = look_up.get_data()
@@ -692,9 +692,10 @@ class VideoView(View):
"video": video_data,
"playlist_nav": playlist_nav,
"title": video_title,
- "colors": colors,
- "cast": cast,
+ "colors": config_handler.colors,
+ "cast": config_handler.config["application"]["enable_cast"],
"version": settings.TA_VERSION,
+ "config": config_handler.config,
}
return render(request, "home/video.html", context)
@@ -711,14 +712,6 @@ class VideoView(View):
return all_navs
- @staticmethod
- def read_config(user_id):
- """read config file"""
- config_handler = AppConfig(user_id)
- cast = config_handler.config["application"]["enable_cast"]
- colors = config_handler.colors
- return colors, cast
-
@staticmethod
def star_creator(rating):
"""convert rating float to stars"""
From 99e0c1c90ef89542457f8521cf4bad96e71d0bed Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 8 Apr 2022 23:15:58 +0700
Subject: [PATCH 10/23] bump yt-dlp
---
tubearchivist/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt
index 1650ebd..d7e9c47 100644
--- a/tubearchivist/requirements.txt
+++ b/tubearchivist/requirements.txt
@@ -9,4 +9,4 @@ requests==2.27.1
ryd-client==0.0.3
uWSGI==2.0.20
whitenoise==6.0.0
-yt_dlp==2022.3.8.2
+yt_dlp==2022.4.8
From d8c7b3df0bf259f5458369ba64320b79926247a4 Mon Sep 17 00:00:00 2001
From: simon
Date: Sat, 9 Apr 2022 14:12:03 +0700
Subject: [PATCH 11/23] better error message for wrong es version, #197
---
tubearchivist/home/apps.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tubearchivist/home/apps.py b/tubearchivist/home/apps.py
index 46a940c..1053bc6 100644
--- a/tubearchivist/home/apps.py
+++ b/tubearchivist/home/apps.py
@@ -97,9 +97,8 @@ class StartupCheck:
if invalid:
print(
- "minial required elasticsearch version: "
- + f"{self.MIN_MAJOR}.{self.MIN_MINOR}, "
- + "please update to recommended version."
+ "required elasticsearch version: "
+ + f"{self.MIN_MAJOR}.{self.MIN_MINOR}"
)
sys.exit(1)
From 10385b14142bb4e147052fddd5c244842a2c9220 Mon Sep 17 00:00:00 2001
From: simon
Date: Sun, 10 Apr 2022 15:57:15 +0700
Subject: [PATCH 12/23] bump bs4
---
tubearchivist/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt
index d7e9c47..7d03d08 100644
--- a/tubearchivist/requirements.txt
+++ b/tubearchivist/requirements.txt
@@ -1,4 +1,4 @@
-beautifulsoup4==4.11.0
+beautifulsoup4==4.11.1
celery==5.2.6
Django==4.0.3
django-cors-headers==3.11.0
From 31378ac756695e6a5f7acb9426487f61a8561289 Mon Sep 17 00:00:00 2001
From: simon
Date: Sun, 10 Apr 2022 15:58:11 +0700
Subject: [PATCH 13/23] better generic schedule validator for impossible input,
#209
---
tubearchivist/home/src/ta/config.py | 33 +++++++++++++++++++++--------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py
index c89d62c..4b98c4a 100644
--- a/tubearchivist/home/src/ta/config.py
+++ b/tubearchivist/home/src/ta/config.py
@@ -220,18 +220,33 @@ class ScheduleBuilder:
raise ValueError("invalid input")
to_write = dict(zip(keys, values))
- all_hours = [int(i) for i in re.split(r"\D+", to_write["hour"])]
- if max(all_hours) > 23:
- print("hour can't be greater than 23")
- raise ValueError("invalid input")
- try:
- int(to_write["minute"])
- except ValueError as error:
- print("too frequent: only number in minutes are supported")
- raise ValueError("invalid input") from error
+ self._validate_cron(to_write)
return to_write
+ @staticmethod
+ def _validate_cron(to_write):
+ """validate all fields, raise value error for impossible schedule"""
+ all_hours = list(re.split(r"\D+", to_write["hour"]))
+ for hour in all_hours:
+ if hour.isdigit() and int(hour) > 23:
+ print("hour can not be greater than 23")
+ raise ValueError("invalid input")
+
+ all_days = list(re.split(r"\D+", to_write["day_of_week"]))
+ for day in all_days:
+ if day.isdigit() and int(day) > 6:
+ print("day can not be greater than 6")
+ raise ValueError("invalid input")
+
+ if not to_write["minute"].isdigit():
+ print("too frequent: only number in minutes are supported")
+ raise ValueError("invalid input")
+
+ if int(to_write["minute"]) > 59:
+ print("minutes can not be greater than 59")
+ raise ValueError("invalid input")
+
def build_schedule(self):
"""build schedule dict as expected by app.conf.beat_schedule"""
schedule_dict = {}
From 77a19a62df4239f5292ce3a59c1661d4841196d9 Mon Sep 17 00:00:00 2001
From: crocs <34723037+pairofcrocs@users.noreply.github.com>
Date: Sun, 10 Apr 2022 04:19:39 -0500
Subject: [PATCH 14/23] added tumbnail reference in the wiki page (#213)
Co-authored-by: user.crocs
---
docs/Settings.md | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/Settings.md b/docs/Settings.md
index 8a66fdf..488b184 100644
--- a/docs/Settings.md
+++ b/docs/Settings.md
@@ -34,7 +34,7 @@ Additional settings passed to yt-dlp.
## Integrations
All third party integrations of TubeArchivist will **always** be *opt in*.
-- **API**: Your access token for the Tube Archivist API.
+- **API**: Your access token for the Tube Archivist API.
- **returnyoutubedislike.com**: This will get return dislikes and average ratings for each video by integrating with the API from [returnyoutubedislike.com](https://www.returnyoutubedislike.com/).
- **Cast**: Enabling the cast integration in the settings page will load an additional JS library from **Google**.
* Requirements
@@ -55,7 +55,7 @@ Examples:
- **0 15 \***: Run task every day at 15:00 in the afternoon.
- **30 8 \*/2**: Run task every second day of the week (Sun, Tue, Thu, Sat) at 08:30 in the morning.
- **0 \*/3,8-17 \***: Execute every hour divisible by 3, and every hour during office hours (8 in the morning - 5 in the afternoon).
-- **0 8,16 \***: Execute every day at 8 in the morning and at 4 in the afternoon.
+- **0 8,16 \***: Execute every day at 8 in the morning and at 4 in the afternoon.
- **auto**: Sensible default.
- **0**: (zero), deactivate that task.
@@ -71,9 +71,9 @@ That's the equivalent task as run from the downloads page looking through your c
Start downloading all videos currently in the download queue.
## Refresh Metadata
-Rescan videos, channels and playlists on youtube and update metadata periodically. This will also deactivate an item and exclude it from future refreshes if the link on YouTube is no longer available. This task is meant to be run once per day, set your schedule accordingly.
+Rescan videos, channels and playlists on youtube and update metadata periodically. This will also deactivate an item and exclude it from future refreshes if the link on YouTube is no longer available. This task is meant to be run once per day, set your schedule accordingly.
-The field **Refresh older than x days** takes a number where TubeArchivist will consider an item as *outdated*. This value is used to calculate how many items need to be refreshed today based on the total indexed. This will spread out the requests to YouTube. Sensible value here is **90** days.
+The field **Refresh older than x days** takes a number where TubeArchivist will consider an item as *outdated*. This value is used to calculate how many items need to be refreshed today based on the total indexed. This will spread out the requests to YouTube. Sensible value here is **90** days.
## Thumbnail check
This will check if all expected thumbnails are there and will delete any artwork without matching video.
@@ -130,5 +130,6 @@ This function will go through all your media files and looks at the whole index
- Should the filename not match with the indexed media url, this will rename the video files correctly and update the index with the new link.
- When you delete media files from the filesystem outside of the Tube Archivist interface, this will delete leftover metadata from the index.
- When you have media files that are not indexed yet, this will grab the metadata from YouTube like it was a newly downloaded video. This can be useful when restoring from an older backup file with missing metadata but already downloaded mediafiles. NOTE: This only works if the media files are named in the same convention as Tube Archivist does, particularly the YouTube ID needs to be at the same index in the filename, alternatively see above for *Manual Media Files Import*.
+-This will also check all of your thumbnails and download any that are missing.
BE AWARE: There is no undo.
From c316d0554957fc4900e2ec94c02c82ecf979fae9 Mon Sep 17 00:00:00 2001
From: Nathan DeTar
Date: Sun, 10 Apr 2022 02:20:58 -0700
Subject: [PATCH 15/23] Added sponsorblock skipping (#208)
* Added sponsorblock skipping.
* Basic framework for sending SB timestamps
* Sponsorblock send timestamp UI improvements
* Added Sponsorblock Icons
* Minor UI tweaks
* Revert UI changes, implement in new UI
* Added notification when sponsor segment is skipped
* Add formatting for notifications & SB messages
* Added SB messages to JS player
* Added SB skip notifcation to videos page.
* Added SB messages to video page
* Change SB messages.
* Check channel_overwrites
* Check Per Channel Settings.
* Cleanup
---
tubearchivist/home/templates/home/video.html | 31 ++++
tubearchivist/static/css/style.css | 19 +++
tubearchivist/static/script.js | 150 ++++++++++++++++++-
3 files changed, 199 insertions(+), 1 deletion(-)
diff --git a/tubearchivist/home/templates/home/video.html b/tubearchivist/home/templates/home/video.html
index 324d293..d1ff3a7 100644
--- a/tubearchivist/home/templates/home/video.html
+++ b/tubearchivist/home/templates/home/video.html
@@ -3,6 +3,36 @@
{% load static %}
{% load humanize %}
+
+
+ {% if video.channel.channel_overwrites.integrate_sponsorblock %}
+ {% if video.channel.channel_overwrites.integrate_sponsorblock == True %}
+ {% if not video.sponsorblock %}
+
This video doesn't have any sponsor segments added. To add a segment go to this video on YouTube and add a segment using the SponsorBlock extension.
+ {% endif %}
+ {% if video.sponsorblock %}
+ {% for segment in video.sponsorblock %}
+ {% if segment.locked != 1 %}
+