Skip to content
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.

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

[plugin.video.arteplussept@matrix] 1.4.2 #4443

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions plugin.video.arteplussept/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Changelog also available in file ./addon.xml xpath /addon/extension/news following Kodi guidelines https://kodi.wiki/view/Add-on_structure#changelog.txt

v1.4.2 (2024-1-3)
- Rename quality parameter.
- Use https to get HBB TV Stream info.
- Fix bug preventing to open series menu

v1.4.1 (2023-10-10)
- Fix playing videos with siblings.

Expand Down
14 changes: 5 additions & 9 deletions plugin.video.arteplussept/addon.xml
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.arteplussept" name="Arte +7" version="1.4.1" provider-name="bmf, thomas-ernest">
<addon id="plugin.video.arteplussept" name="Arte +7" version="1.4.2" provider-name="bmf, thomas-ernest">
<!-- https://kodi.wiki/view/Addon.xml -->
<requires>
<import addon="xbmc.python" version="3.0.0"/>
Expand Down Expand Up @@ -56,19 +56,15 @@ https://github.com/thomas-ernest/plugin.video.arteplussept
<website>https://www.arte.tv/fr/</website>
<source>https://github.com/thomas-ernest/plugin.video.arteplussept</source>
<news>
v1.4.2 (2024-1-3)
- Rename quality parameter.
- Use https to get HBB TV Stream info.
- Fix bug preventing to open series menu
v1.4.1 (2023-10-10)
- Fix playing videos with siblings.
v1.4.0 (2023-8-14)
- Add support for content over multiple pages.
- Refactor most of the code in OO style
v1.3.1 (2023-8-12)
- Add context menu to view collection as menu instead of playlist
- Set resume point to 0 when video was fully watched. Avoid crash when playing seq of watched videos in playlist.
v1.3.0 (2023-8-6)
- Improve security with better password management
- Stop storing password on filesystem though addon settings
- Make thomas-ernest fork official in addon.xml for visibility in wiki
- Minor fix/clean-up in translation
</news>
<assets>
<icon>resources/icon.png</icon>
Expand Down
2 changes: 1 addition & 1 deletion plugin.video.arteplussept/resources/lib/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
_PLUGIN_NAME = Plugin().name
_PLUGIN_VERSION = Plugin().addon.getAddonInfo('version')
# Arte hbbtv - deprecated API since 2022 prefer Arte TV API
_HBBTV_URL = 'http://www.arte.tv/hbbtvv2/services/web/index.php'
_HBBTV_URL = 'https://www.arte.tv/hbbtvv2/services/web/index.php'
_HBBTV_HEADERS = {
'user-agent': f"{_PLUGIN_NAME}/{_PLUGIN_VERSION}"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ def _build_menu(self, json_dict, collection_type, **nav_arg):
# Abstract class should NOT be instantiated
# pylint: disable=assignment-from-none
meta = self._get_page_meta(json_dict)
items = [ArteTvVideoItem(self.plugin, item).map_artetv_item() for item in pages]
items = []
for page_item in pages:
menu_item = ArteTvVideoItem(self.plugin, page_item).map_artetv_item()
if menu_item is not None:
items.append(menu_item)
if meta and meta.get('pages', False):
total_pages = meta.get('pages')
current_page = meta.get('page')
Expand Down
10 changes: 6 additions & 4 deletions plugin.video.arteplussept/resources/lib/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import dataclasses

languages = ['fr', 'de', 'en', 'es', 'pl', 'it']
qualities = ['SQ', 'EQ', 'HQ']
# though misleqding the below mapping is correct e.g. SQ is High Quality 720p
# dict keys must be in same order as in settings.xml
quality_map = {'Low': 'HQ', 'Medium': 'EQ', 'High': 'SQ'}
loglevel = ['DEFAULT', 'API']


Expand All @@ -16,9 +18,9 @@ def __init__(self, plugin):
self.language = plugin.get_setting(
'lang', choices=languages) or languages[0]
# Quality of the videos
# defaults to SQ
self.quality = plugin.get_setting(
'quality', choices=qualities) or qualities[0]
# defaults to High, SQ, 720p
self.quality = quality_map[plugin.get_setting(
'quality', choices=list(quality_map.keys()))] or quality_map['High']
# Should the plugin display all available streams for videos?
# defaults to False
self.show_video_streams = plugin.get_setting(
Expand Down
4 changes: 2 additions & 2 deletions plugin.video.arteplussept/resources/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
id="quality"
type="enum"
label="30052"
values="SQ (High)|EQ (Medium)|HQ (Low)"
default="0"/>
values="Low|Medium|High"
default="2"/>
<setting
id="show_video_streams"
type="bool"
Expand Down
Loading