Skip to content

Commit 8afb477

Browse files
codingPFcodingPF
committed
Merge branch 'develop'
2 parents c52484a + 5626c6f commit 8afb477

230 files changed

Lines changed: 576 additions & 461 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ __pycache__
99
/venv
1010
/.pydevproject
1111
/.project
12+
/.settings

‎Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxserver/mariadb
1+
FROM ghcr.io/linuxserver/mariadb
22

33
# fill variables from linuxserver/mariadb with mediathekview default (https://docs.linuxserver.io/images/docker-mariadb)
44
ENV MYSQL_DATABASE='mediathekview'
@@ -11,10 +11,9 @@ ENV CRON_TIMESPEC="0 4-22/1 * * *"
1111
ENV RUN_ON_STARTUP='no'
1212

1313
# install dependencies
14-
RUN apt update -y && \
15-
apt install python3-pip cron vim -y && \
16-
apt autoclean -y && \
17-
apt autoremove -y
14+
RUN apk update && apk upgrade && \
15+
apk add py3-pip apk-cron vim && \
16+
rm -rf /var/cache/apk/*
1817

1918
RUN pip3 install mysql-connector-python
2019

@@ -26,4 +25,4 @@ ADD resources/ ./resources/
2625
#add a script that configures and starts cronjob
2726
ADD docker/95_mediathekview_db /etc/cont-init.d/
2827

29-
#CMD and ENTRYPOINT are set by base image
28+
#CMD and ENTRYPOINT are set by base image

‎README.md‎

Lines changed: 11 additions & 2 deletions

‎addon.kodi18.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<addon id="plugin.video.mediathekview"
33
name="MediathekView"
4-
version="1.0.0"
4+
version="1.0.8"
55
provider-name="MediathekView.de, Leo Moll">
66
<requires>
77
<import addon="xbmc.python" version="2.25.0"/>
@@ -24,6 +24,18 @@
2424
<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
2525
<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
2626
<news>
27+
v.1.0.8 (2021-xx-xx):
28+
- [new] #194 landscape fanart and changed content id to video
29+
- [new] #196 download all items in one folder via context menue
30+
- [fix] Letterbox selection for lower case letters sorting in incorrectly under #
31+
- [fix] Kodi settings for batchSize must be int (Kodi 17 issue)
32+
- [fix] #197 change connect settings and MySqlDB settings to utf8mb4
33+
- [other] Updater messages to be logged as debug (not info) #207
34+
- [other] Removed sqlite custom functions (unixtimestamp / group concat)
35+
- [other] Update Dockerfile - Linuxserver.io changed the mariadb baseimage
36+
- [other] remove HD download option and add config setting for quality
37+
- [other] Add missing livestream icons (SWR RP / BW / Arte EN)
38+
- [other] internal update to file parsing
2739
v.1.0.0 (2021-03-14):
2840
- [fix] #125 fix for add to favorits
2941
- [new] #56 simple black list

‎addon.kodi19.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<addon id="plugin.video.mediathekview"
33
name="MediathekView"
4-
version="1.0.0+matrix.1"
4+
version="1.0.8+matrix.1"
55
provider-name="MediathekView.de, Leo Moll">
66
<requires>
77
<import addon="xbmc.python" version="3.0.0"/>
@@ -23,6 +23,18 @@
2323
<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
2424
<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
2525
<news>
26+
v.1.0.8 (2021-xx-xx):
27+
- [new] #194 landscape fanart and changed content id to video
28+
- [new] #196 download all items in one folder via context menue
29+
- [fix] Letterbox selection for lower case letters sorting in incorrectly under #
30+
- [fix] Kodi settings for batchSize must be int (Kodi 17 issue)
31+
- [fix] #197 change connect settings and MySqlDB settings to utf8mb4
32+
- [other] Updater messages to be logged as debug (not info) #207
33+
- [other] Removed sqlite custom functions (unixtimestamp / group concat)
34+
- [other] Update Dockerfile - Linuxserver.io changed the mariadb baseimage
35+
- [other] remove HD download option and add config setting for quality
36+
- [other] Add missing livestream icons (SWR RP / BW / Arte EN)
37+
- [other] internal update to file parsing
2638
v.1.0.0 (2021-03-14):
2739
- [fix] #125 fix for add to favorits
2840
- [new] #56 simple black list

‎addon.xml‎

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,40 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<addon id="plugin.video.mediathekview"
3-
name="MediathekView"
4-
version="1.0.0+matrix.1"
5-
provider-name="MediathekView.de, Leo Moll">
6-
<requires>
7-
<import addon="xbmc.python" version="3.0.0"/>
8-
<import addon="script.module.myconnpy" version="1.1.7"/>
9-
</requires>
10-
<extension
11-
point="xbmc.python.pluginsource"
12-
library="addon.py">
13-
<provides>video</provides>
14-
</extension>
15-
<extension
16-
point="xbmc.service"
17-
library="service.py"/>
18-
<extension point="xbmc.addon.metadata">
19-
<summary lang="de_DE">Öffentlich-Rechtliche Mediatheken</summary>
20-
<summary lang="en_GB">Public service video-platforms</summary>
21-
<summary lang="it_IT">Piattaforme video dalle emittenti pubbliche</summary>
22-
<description lang="de_DE">Ermöglicht den Zugriff auf fast alle deutschen Mediatheken der öffentlich Rechtlichen basierend auf der Datenbank von MediathekView.de</description>
23-
<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
24-
<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
25-
<news>
3+
name="MediathekView"
4+
version="1.0.8+matrix.1"
5+
provider-name="MediathekView.de, Leo Moll">
6+
<requires>
7+
<import addon="xbmc.python" version="3.0.0"/>
8+
<import addon="script.module.myconnpy" version="1.1.7"/>
9+
</requires>
10+
<extension
11+
point="xbmc.python.pluginsource"
12+
library="addon.py">
13+
<provides>video</provides>
14+
</extension>
15+
<extension
16+
point="xbmc.service"
17+
library="service.py"/>
18+
<extension point="xbmc.addon.metadata">
19+
<summary lang="de_DE">Öffentlich-Rechtliche Mediatheken</summary>
20+
<summary lang="en_GB">Public service video-platforms</summary>
21+
<summary lang="it_IT">Piattaforme video dalle emittenti pubbliche</summary>
22+
<description lang="de_DE">Ermöglicht den Zugriff auf fast alle deutschen Mediatheken der öffentlich Rechtlichen basierend auf der Datenbank von MediathekView.de</description>
23+
<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
24+
<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
25+
<news>
26+
v.1.0.8 (2021-xx-xx):
27+
- [new] #194 landscape fanart and changed content id to video
28+
- [new] #196 download all items in one folder via context menue
29+
- [fix] Letterbox selection for lower case letters sorting in incorrectly under #
30+
- [fix] Kodi settings for batchSize must be int (Kodi 17 issue)
31+
- [fix] #197 change connect settings and MySqlDB settings to utf8mb4
32+
- [other] Updater messages to be logged as debug (not info) #207
33+
- [other] Removed sqlite custom functions (unixtimestamp / group concat)
34+
- [other] Update Dockerfile - Linuxserver.io changed the mariadb baseimage
35+
- [other] remove HD download option and add config setting for quality
36+
- [other] Add missing livestream icons (SWR RP / BW / Arte EN)
37+
- [other] internal update to file parsing
2638
v.1.0.0 (2021-03-14):
2739
- [fix] #125 fix for add to favorits
2840
- [new] #56 simple black list
@@ -35,20 +47,20 @@ v.1.0.0 (2021-03-14):
3547

3648
v.0.6.6 (2020-11-21)
3749
</news>
38-
<platform>all</platform>
39-
<language>de fr</language>
40-
<license>MIT</license>
41-
<forum>https://forum.kodi.tv/showthread.php?tid=326799</forum>
42-
<source>https://github.com/mediathekview/plugin.video.mediathekview</source>
43-
<website>https://mediathekview.de/</website>
44-
<email>info@mediathekview.de</email>
45-
<assets>
46-
<icon>resources/icon.png</icon>
47-
<fanart>resources/fanart.jpg</fanart>
48-
<screenshot>resources/screenshot1.png</screenshot>
49-
<screenshot>resources/screenshot2.png</screenshot>
50-
<screenshot>resources/screenshot3.png</screenshot>
51-
<screenshot>resources/screenshot4.png</screenshot>
52-
</assets>
53-
</extension>
50+
<platform>all</platform>
51+
<language>de fr</language>
52+
<license>MIT</license>
53+
<forum>https://forum.kodi.tv/showthread.php?tid=326799</forum>
54+
<source>https://github.com/mediathekview/plugin.video.mediathekview</source>
55+
<website>https://mediathekview.de/</website>
56+
<email>info@mediathekview.de</email>
57+
<assets>
58+
<icon>resources/icon.png</icon>
59+
<fanart>resources/fanart.jpg</fanart>
60+
<screenshot>resources/screenshot1.png</screenshot>
61+
<screenshot>resources/screenshot2.png</screenshot>
62+
<screenshot>resources/screenshot3.png</screenshot>
63+
<screenshot>resources/screenshot4.png</screenshot>
64+
</assets>
65+
</extension>
5466
</addon>

‎docker/95_mediathekview_db‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ else
3737
fi
3838

3939
echo "[mediathekview_db] Start cron"
40-
/usr/sbin/cron -f -L 1 &
40+
/usr/sbin/crond -f -L 1 &

‎resources/icons/broadcast-f.png‎

17.1 KB

‎resources/icons/clock.png‎

-15.8 KB
Binary file not shown.

‎resources/icons/control-f.png‎

20.7 KB

0 commit comments

Comments
 (0)