thegame_1980/TwinVine
1
0
Fork 0
mirror of https://github.com/vinefeeder/TwinVine.git synced 2026-07-15 18:10:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

1.4.8; search from menu

Browse Source
This commit is contained in:
VineFeeder
2025-10-15 11:35:58 +01:00
parent b05047259f
commit fa8f7a2a57
23 changed files with 669 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/vinefeeder/src/vinefeeder/config.yaml
+1 -1
View File
@@ -1,2 +1,2 @@
BATCH_DOWNLOAD: true
BATCH_DOWNLOAD: false
TERMINAL_RESET: true
packages/vinefeeder/src/vinefeeder/services/ALL4/__init__.py
+9 -7
View File
@@ -90,15 +90,17 @@ class All4Loader(BaseLoader):
elif inx == 0:
# from greedy-search OR selecting Browse-category
# example: https://www.channel4.com/programmes/the-great-british-bake-off/on-demand/75228-001
# need a search keyword(s) from url
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
search_term = search_term.split("/")[4]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
else:
search_term = search_term.split("/")[4]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/BBC/__init__.py
+2 -6
View File
@@ -185,12 +185,8 @@ class BbcLoader(BaseLoader):
search_term.split("series")[0].replace("-", " ").strip()
)
return self.fetch_videos(search_term)
else:
print(
f"No search term found in {search_term}\nTry again with a series name in the url."
)
return
else:
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/ITVX/__init__.py
+9 -8
View File
@@ -62,7 +62,6 @@ class ItvxLoader(BaseLoader):
e,
"Is the package for vinefeeder/envied installed correctly ?",
)
return
# keyword search
@@ -73,14 +72,16 @@ class ItvxLoader(BaseLoader):
# ALTERNATIVES BELOW FROM POP-UP MENU
elif inx == 0:
# from greedy-search OR selecting Browse-category
# need a search keyword(s) from url
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
else:
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/MY5/__init__.py
+3
View File
@@ -66,9 +66,12 @@ class My5Loader(BaseLoader):
# ALTERNATIVES BELOW FROM POP-UP MENU
elif inx == 0:
# from greedy-search OR selecting Browse-category
if not 'https' in search_term:
return self.fetch_videos(search_term)
# example: https://www.channel5.com/the-teacher/season-2/episode-2
# need a search keyword(s) from url
# split and select series name
if "show" in search_term:
match = re.search(r"\/show\/([a-z-]+)", search_term)
packages/vinefeeder/src/vinefeeder/services/PLEX/__init__.py
+11 -7
View File
@@ -73,14 +73,18 @@ class PlexLoader(BaseLoader):
elif inx == 0:
# from greedy-search OR selecting Browse-category
# example: https://www.channel4.com/programmes/the-great-british-bake-off/on-demand/75228-001
# need a search keyword(s) from url
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
else:
# need a search keyword(s) from url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/RTE/__init__.py
+11 -7
View File
@@ -82,14 +82,18 @@ class RteLoader(BaseLoader):
elif inx == 0:
# from greedy-search OR selecting Browse-category
# example: https://www.channel4.com/programmes/the-great-british-bake-off/on-demand/75228-001
# need a search keyword(s) from url
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
else:
# need a search keyword(s) from url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/STV/__init__.py
+10 -6
View File
@@ -78,12 +78,16 @@ class StvLoader(BaseLoader):
# https://player.stv.tv/summary/joan
# need a search keyword(s) from url
# split and select series name
search_term = search_term.split("/")[-1]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
else:
search_term = search_term.split("/")[-1]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/TPTV/__init__.py
+10 -6
View File
@@ -110,12 +110,16 @@ class TptvLoader(BaseLoader):
# ALTERNATIVES BELOW FROM POP-UP MENU
elif inx == 0:
# from greedy-search OR selecting Browse-category
search_term = search_term.split("/")[-1]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
else:
search_term = search_term.split("/")[-1]
# fetch_videos_by_category search_term may have other params to remove
if "?" in search_term:
search_term = search_term.split("?")[0].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/TVNZ/__init__.py
+7 -2
View File
@@ -94,9 +94,14 @@ class TvnzLoader(BaseLoader):
# from greedy-search OR selecting Browse-category
# need a search keyword(s) from url
# split and select series name
search_term = search_term.split("/")[4]
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
else:
search_term = search_term.split("/")[4]
return self.fetch_videos(search_term)
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category
packages/vinefeeder/src/vinefeeder/services/U/__init__.py
+8 -4
View File
@@ -72,11 +72,15 @@ class ULoader(BaseLoader):
elif inx == 0:
# from greedy-search OR selecting Browse-category
# example https://u.co.uk/shows/worlds-most-dangerous-roads/series-6/episode-1/6363704256112
# need a search keyword(s) from url
if not 'https' in search_term:
return self.fetch_videos(search_term)
# need a search keyword(s) from category url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
return self.fetch_videos(search_term)
else:
# need a search keyword(s) from url
# split and select series name
search_term = search_term.split("/")[4].replace("-", " ")
return self.fetch_videos(search_term)
elif "http" in search_term and inx == 2:
self.category = category