Skip to content

Commit

Permalink
release: v1.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
newt-sc committed Feb 4, 2021
1 parent b403d49 commit be94d3d
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* [v1.10.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.10.0):
* Remove TVShow item from season listing
* Add episode title template without number

* [v1.9.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.9.0):
* Add watched indication to TVShow title in season's listing when all seasons are watched
* Include director, writer, cast, country and studio meta in general title views
Expand Down
18 changes: 7 additions & 11 deletions a4kStreaming/explorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ def __get_episode_title(core, season, episode, title):
season_zfill = str(season).zfill(2)
episode_zfill = str(episode).zfill(2)
if season_template == '1':
return 'E%s. %s' % (episode_zfill, title)
return '%s. %s' % (episode, title)
if season_template == '2':
return '%sx%s. %s' % (season_zfill, episode_zfill, title)
return 'E%s. %s' % (episode_zfill, title)
if season_template == '3':
return '%sx%s. %s' % (season_zfill, episode_zfill, title)
if season_template == '4':
return 'S%sE%s. %s' % (season_zfill, episode_zfill, title)
return '%s. %s' % (episode, title)
return '%s' % title

def __handle_request_error(core, params, response):
if not params.silent:
Expand Down Expand Up @@ -178,11 +180,6 @@ def __add_seasons(core, title):
except:
pass

title['tvshow_watched'] = True
if not title.get('episodes', None):
title['episodes'] = {}
title['episodes']['totalEpisodes'] = len(episodes)

list_items = []
for key in seasons:
season = seasons[key]
Expand All @@ -203,7 +200,8 @@ def __add_seasons(core, title):
'tvshowtitle': season.title,
'year': season.year,
'season': key,
'episode': season.episodes
'episode': season.episodes,
'plot': title.get('plot', None)
}
list_item.setInfo('video', video_meta)

Expand Down Expand Up @@ -235,13 +233,11 @@ def __add_seasons(core, title):
context_menu_items.append(
('IMDb: Mark as watched', 'RunPlugin(plugin://plugin.video.a4kstreaming/?action=profile&type=mark_as_watched&id=%s&ids=%s)' % ('Season %s' % season.key, '__'.join(season.episode_ids)))
)
title['tvshow_watched'] = False

list_item.addContextMenuItems(context_menu_items)
list_item.setContentLookup(False)
list_items.append((url, list_item, True))

__add_titles(core, [title], browse=False)
core.kodi.xbmcplugin.addDirectoryItems(core.handle, list_items, len(list_items))

def __add_episodes(core, title, season):
Expand Down
6 changes: 5 additions & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.a4kstreaming"
name="a4kStreaming"
version="1.9.0"
version="1.10.0"
provider-name="Unknown">
<requires>
<import addon="script.module.requests"/>
Expand Down Expand Up @@ -32,6 +32,10 @@ Designed for low-end devices and Estuary skin.
<screenshot>screenshot-06.jpg</screenshot>
</assets>
<news>
[v1.10.0]:
* Remove TVShow item from season listing
* Add episode title template without number

[v1.9.0]:
* Add watched indication to TVShow title in season's listing when all seasons are watched
* Include director, writer, cast, country and studio meta in general title views
Expand Down
6 changes: 5 additions & 1 deletion packages/addons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<addons>
<addon id="plugin.video.a4kstreaming"
name="a4kStreaming"
version="1.9.0"
version="1.10.0"
provider-name="Unknown">
<requires>
<import addon="script.module.requests"/>
Expand Down Expand Up @@ -35,6 +35,10 @@ Designed for low-end devices and Estuary skin.
<screenshot>screenshot-06.jpg</screenshot>
</assets>
<news>
[v1.10.0]:
* Remove TVShow item from season listing
* Add episode title template without number

[v1.9.0]:
* Add watched indication to TVShow title in season's listing when all seasons are watched
* Include director, writer, cast, country and studio meta in general title views
Expand Down
2 changes: 1 addition & 1 deletion packages/addons.xml.crc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b6063b8bf44753e9d6cd9d553827349bbc578901
c6ad7fbca6eb19a3c0a48ffd37b6efaadff3188a
4 changes: 4 additions & 0 deletions resources/language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ msgid "Season 1 - 10 Episodes"
msgstr ""

# Episode Title Templates
msgctxt "#33115"
msgid "Title"
msgstr ""

msgctxt "#33116"
msgid "1. Title"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion resources/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<setting id="general.page_size" label="33103" type="slider" default="29" option="int" range="10,100"/>
<setting id="general.lists_page_size" label="33104" type="slider" default="29" option="int" range="10,100"/>
<setting id="general.season_title_template" label="33105" type="enum" default="0" lvalues='33111|33112|33113|33114'/>
<setting id="general.episode_title_template" label="33106" type="enum" default="0" lvalues='33116|33117|33118|33119'/>
<setting id="general.episode_title_template" label="33106" type="enum" default="1" lvalues='33115|33116|33117|33118|33119'/>
</category>
<!-- Views -->
<category label="33002">
Expand Down

0 comments on commit be94d3d

Please sign in to comment.