mirror of
https://github.com/dmunozv04/iSponsorBlockTV.git
synced 2025-12-07 20:36:44 +03:00
Compare commits
2 Commits
1f9f8ab0b1
...
add-custom
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e00c62af1 | ||
|
|
1567a33e51 |
@@ -18,5 +18,6 @@
|
|||||||
{"id": "",
|
{"id": "",
|
||||||
"name": ""
|
"name": ""
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"api_server": "https://sponsor.ajay.app"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class ApiHelper:
|
|||||||
self.skip_count_tracking = config.skip_count_tracking
|
self.skip_count_tracking = config.skip_count_tracking
|
||||||
self.web_session = web_session
|
self.web_session = web_session
|
||||||
self.num_devices = len(config.devices)
|
self.num_devices = len(config.devices)
|
||||||
|
self.api_server = config.api_server
|
||||||
|
|
||||||
# Not used anymore, maybe it can stay here a little longer
|
# Not used anymore, maybe it can stay here a little longer
|
||||||
@AsyncLRU(maxsize=10)
|
@AsyncLRU(maxsize=10)
|
||||||
@@ -130,7 +131,7 @@ class ApiHelper:
|
|||||||
"service": constants.SponsorBlock_service,
|
"service": constants.SponsorBlock_service,
|
||||||
}
|
}
|
||||||
headers = {"Accept": "application/json"}
|
headers = {"Accept": "application/json"}
|
||||||
url = constants.SponsorBlock_api + "skipSegments/" + vid_id_hashed
|
url = self.api_server + "/api/skipSegments/" + vid_id_hashed
|
||||||
async with self.web_session.get(
|
async with self.web_session.get(
|
||||||
url, headers=headers, params=params
|
url, headers=headers, params=params
|
||||||
) as response:
|
) as response:
|
||||||
@@ -201,7 +202,7 @@ class ApiHelper:
|
|||||||
Lets the contributor know that someone skipped the segment (thanks)"""
|
Lets the contributor know that someone skipped the segment (thanks)"""
|
||||||
if self.skip_count_tracking:
|
if self.skip_count_tracking:
|
||||||
for i in uuids:
|
for i in uuids:
|
||||||
url = constants.SponsorBlock_api + "viewedVideoSponsorTime/"
|
url = self.api_server + "/api/viewedVideoSponsorTime/"
|
||||||
params = {"UUID": i}
|
params = {"UUID": i}
|
||||||
await self.web_session.post(url, params=params)
|
await self.web_session.post(url, params=params)
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ REPORT_SKIPPED_SEGMENTS_PROMPT = (
|
|||||||
MUTE_ADS_PROMPT = "Do you want to mute native YouTube ads automatically? (y/N) "
|
MUTE_ADS_PROMPT = "Do you want to mute native YouTube ads automatically? (y/N) "
|
||||||
SKIP_ADS_PROMPT = "Do you want to skip native YouTube ads automatically? (y/N) "
|
SKIP_ADS_PROMPT = "Do you want to skip native YouTube ads automatically? (y/N) "
|
||||||
AUTOPLAY_PROMPT = "Do you want to enable autoplay? (Y/n) "
|
AUTOPLAY_PROMPT = "Do you want to enable autoplay? (Y/n) "
|
||||||
|
ENTER_API_SERVER_PROMPT = (
|
||||||
|
"Enter the custom API server URL (leave blank to use default): "
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_yn_input(prompt):
|
def get_yn_input(prompt):
|
||||||
@@ -190,6 +193,10 @@ def main(config, debug: bool) -> None:
|
|||||||
choice = get_yn_input(AUTOPLAY_PROMPT)
|
choice = get_yn_input(AUTOPLAY_PROMPT)
|
||||||
config.auto_play = choice != "n"
|
config.auto_play = choice != "n"
|
||||||
|
|
||||||
|
api_server = input(ENTER_API_SERVER_PROMPT)
|
||||||
|
if api_server:
|
||||||
|
config.api_server = api_server
|
||||||
|
|
||||||
print("Config finished")
|
print("Config finished")
|
||||||
config.save()
|
config.save()
|
||||||
loop.run_until_complete(web_session.close())
|
loop.run_until_complete(web_session.close())
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ userAgent = "iSponsorBlockTV/0.1"
|
|||||||
SponsorBlock_service = "youtube"
|
SponsorBlock_service = "youtube"
|
||||||
SponsorBlock_actiontype = "skip"
|
SponsorBlock_actiontype = "skip"
|
||||||
|
|
||||||
SponsorBlock_api = "https://sponsor.ajay.app/api/"
|
|
||||||
Youtube_api = "https://www.googleapis.com/youtube/v3/"
|
Youtube_api = "https://www.googleapis.com/youtube/v3/"
|
||||||
|
|
||||||
skip_categories = (
|
skip_categories = (
|
||||||
@@ -20,5 +19,4 @@ skip_categories = (
|
|||||||
|
|
||||||
youtube_client_blacklist = ["TVHTML5_FOR_KIDS"]
|
youtube_client_blacklist = ["TVHTML5_FOR_KIDS"]
|
||||||
|
|
||||||
|
|
||||||
config_file_blacklist_keys = ["config_file", "data_dir"]
|
config_file_blacklist_keys = ["config_file", "data_dir"]
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ class Config:
|
|||||||
self.mute_ads = False
|
self.mute_ads = False
|
||||||
self.skip_ads = False
|
self.skip_ads = False
|
||||||
self.auto_play = True
|
self.auto_play = True
|
||||||
|
self.api_server = "https://sponsor.ajay.app"
|
||||||
self.__load()
|
self.__load()
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
|
|||||||
@@ -876,6 +876,31 @@ class AutoPlayManager(Vertical):
|
|||||||
self.config.auto_play = event.checkbox.value
|
self.config.auto_play = event.checkbox.value
|
||||||
|
|
||||||
|
|
||||||
|
class ApiServerManager(Vertical):
|
||||||
|
"""Manager for the custom API server URL."""
|
||||||
|
|
||||||
|
def __init__(self, config, **kwargs) -> None:
|
||||||
|
super().__init__(**kwargs)
|
||||||
|
self.config = config
|
||||||
|
|
||||||
|
def compose(self) -> ComposeResult:
|
||||||
|
yield Label("Custom API Server", classes="title")
|
||||||
|
yield Label(
|
||||||
|
"You can specify a custom SponsorBlock API server URL here.",
|
||||||
|
classes="subtitle",
|
||||||
|
)
|
||||||
|
with Grid(id="api-server-grid"):
|
||||||
|
yield Input(
|
||||||
|
placeholder="Custom API Server URL",
|
||||||
|
id="api-server-input",
|
||||||
|
value=self.config.api_server,
|
||||||
|
)
|
||||||
|
|
||||||
|
@on(Input.Changed, "#api-server-input")
|
||||||
|
def changed_api_server(self, event: Input.Changed):
|
||||||
|
self.config.api_server = event.input.value
|
||||||
|
|
||||||
|
|
||||||
class ISponsorBlockTVSetupMainScreen(Screen):
|
class ISponsorBlockTVSetupMainScreen(Screen):
|
||||||
"""Making this a separate screen to avoid a bug: https://github.com/Textualize/textual/issues/3221"""
|
"""Making this a separate screen to avoid a bug: https://github.com/Textualize/textual/issues/3221"""
|
||||||
|
|
||||||
@@ -915,6 +940,9 @@ class ISponsorBlockTVSetupMainScreen(Screen):
|
|||||||
yield AutoPlayManager(
|
yield AutoPlayManager(
|
||||||
config=self.config, id="autoplay-manager", classes="container"
|
config=self.config, id="autoplay-manager", classes="container"
|
||||||
)
|
)
|
||||||
|
yield ApiServerManager(
|
||||||
|
config=self.config, id="api-server-manager", classes="container"
|
||||||
|
)
|
||||||
|
|
||||||
def on_mount(self) -> None:
|
def on_mount(self) -> None:
|
||||||
if self.check_for_old_config_entries():
|
if self.check_for_old_config_entries():
|
||||||
|
|||||||
Reference in New Issue
Block a user