Skip to content

[plugin.video.vimeo] 6.0.3 #4670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romanvm merged 1 commit into from
May 30, 2025
Merged

[plugin.video.vimeo] 6.0.3 #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions plugin.video.vimeo/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.vimeo" name="Vimeo" version="6.0.2" provider-name="jaylinski">
<addon id="plugin.video.vimeo" name="Vimeo" version="6.0.3" provider-name="jaylinski">
<requires>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.requests" version="2.29.0"/>
Expand All @@ -16,8 +16,13 @@
<forum>https://forum.kodi.tv/showthread.php?tid=220437</forum>
<website>https://vimeo.com</website>
<source>https://github.com/jaylinski/kodi-addon-vimeo</source>
<news>6.0.2 (2025-02-06)
<news>6.0.3 (2025-05-22)
Fix crash when playing password-protected videos with subtitles enabled

6.0.2 (2025-02-06)
Handle Vimeo geo-blocking by displaying an error to affected users
Don't add video to playlist when shared with addon
Improve video-quality fallback for non-HLS video-formats

6.0.1 (2022-02-25)
Fixed subtitle conversion issue
Expand Down
6 changes: 3 additions & 3 deletions plugin.video.vimeo/resources/lib/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@ def trending(self):
res = self._do_api_request("/videos", params)
return self._map_json_to_collection(res)

def resolve_texttracks(self, uri):
res = self._do_api_request(uri, {})
def resolve_texttracks(self, uri, password=None):
res = self._do_api_request(uri, {"password": password})
subtitles = res.get("data")
for subtitle in subtitles:
subtitle["srt"] = webvtt_to_srt(self._do_request(subtitle["link"]))
return subtitles

def resolve_media_url(self, uri, password=None):
# If we have a on-demand URL, we need to fetch the trailer and return the uri
# If we have an on-demand URL, we need to fetch the trailer and return the uri
if uri.startswith("/ondemand/"):
xbmc.log("plugin.video.vimeo::Api() Resolving on-demand", xbmc.LOGDEBUG)
media_url = self._get_on_demand_trailer(uri)
Expand Down
6 changes: 3 additions & 3 deletions plugin.video.vimeo/resources/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def resolve_list_item(handle, list_item, password=None, fetch_subtitles=False):
list_item.setPath(resolved_url)
text_tracks = list_item.getProperty("textTracks")
if fetch_subtitles and text_tracks:
list_item = add_subtitles(list_item, text_tracks)
list_item = add_subtitles(list_item, text_tracks, password)
xbmcplugin.setResolvedUrl(handle, succeeded=True, listitem=list_item)


Expand All @@ -231,8 +231,8 @@ def search(handle, query):
xbmcplugin.endOfDirectory(handle)


def add_subtitles(item, texttracks_url):
subtitles = api.resolve_texttracks(texttracks_url)
def add_subtitles(item, texttracks_url, password=None):
subtitles = api.resolve_texttracks(texttracks_url, password)
paths = []
for subtitle in subtitles:
file_name = "texttrack.{}.srt".format(subtitle["language"])
Expand Down
⚡