diff --git a/LICENSE.txt b/LICENSE.txt index 4019d34..0633d9b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2018, Leo Moll +Copyright (c) 2017-2020, Leo Moll Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/addon.kodi18.xml b/addon.kodi18.xml index 318a96e..51ad6cf 100644 --- a/addon.kodi18.xml +++ b/addon.kodi18.xml @@ -52,7 +52,7 @@ v.0.6.2 (2019-03-10): </news> <platform>all</platform> <language>de fr</language> - <license>MIT License</license> + <license>MIT</license> <forum>https://forum.kodi.tv/showthread.php?tid=326799</forum> <source>https://github.com/mediathekview/plugin.video.mediathekview</source> <website>https://mediathekview.de/</website> diff --git a/addon.kodi19.xml b/addon.kodi19.xml index 0db0c9c..f59c523 100644 --- a/addon.kodi19.xml +++ b/addon.kodi19.xml @@ -51,7 +51,7 @@ v.0.6.2 (2019-03-10): </news> <platform>all</platform> <language>de fr</language> - <license>MIT License</license> + <license>MIT</license> <forum>https://forum.kodi.tv/showthread.php?tid=326799</forum> <source>https://github.com/mediathekview/plugin.video.mediathekview</source> <website>https://mediathekview.de/</website> diff --git a/addon.py b/addon.py index 48f095d..fc650b6 100644 --- a/addon.py +++ b/addon.py @@ -2,27 +2,9 @@ """ The main addon module -MIT License - Copyright (c) 2017-2018, Leo Moll +SPDX-License-Identifier: MIT -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. """ # -- Imports ------------------------------------------------ diff --git a/addon.xml b/addon.xml index 318a96e..51ad6cf 100644 --- a/addon.xml +++ b/addon.xml @@ -52,7 +52,7 @@ v.0.6.2 (2019-03-10): </news> <platform>all</platform> <language>de fr</language> - <license>MIT License</license> + <license>MIT</license> <forum>https://forum.kodi.tv/showthread.php?tid=326799</forum> <source>https://github.com/mediathekview/plugin.video.mediathekview</source> <website>https://mediathekview.de/</website> diff --git a/mvupdate b/mvupdate index 45839bc..f3b93ef 100755 --- a/mvupdate +++ b/mvupdate @@ -3,27 +3,9 @@ """ The standalone updater application module -MIT License - Copyright (c) 2017-2018, Leo Moll -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/mvupdate3 b/mvupdate3 index 1def424..f84997d 100644 --- a/mvupdate3 +++ b/mvupdate3 @@ -3,27 +3,9 @@ """ The standalone updater application module -MIT License - Copyright (c) 2017-2018, Leo Moll -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/base/logger.py b/resources/lib/base/logger.py index daa1b96..a552a86 100644 --- a/resources/lib/base/logger.py +++ b/resources/lib/base/logger.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT """ The base logger module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License """ diff --git a/resources/lib/channel.py b/resources/lib/channel.py index 758d6f0..18cab48 100644 --- a/resources/lib/channel.py +++ b/resources/lib/channel.py @@ -3,7 +3,7 @@ The channel model module Copyright 2017-2019, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ diff --git a/resources/lib/channelui.py b/resources/lib/channelui.py index 39e09d9..5ca908b 100644 --- a/resources/lib/channelui.py +++ b/resources/lib/channelui.py @@ -3,7 +3,7 @@ The channel model UI module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=import-error diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py index f8305ef..5a1f414 100644 --- a/resources/lib/downloader.py +++ b/resources/lib/downloader.py @@ -3,7 +3,7 @@ Download handler module Copyright (c) 2018, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/exceptions.py b/resources/lib/exceptions.py index fe79020..4dcdfb2 100644 --- a/resources/lib/exceptions.py +++ b/resources/lib/exceptions.py @@ -3,7 +3,7 @@ The custom exception module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ diff --git a/resources/lib/film.py b/resources/lib/film.py index d61ff95..f866438 100644 --- a/resources/lib/film.py +++ b/resources/lib/film.py @@ -3,7 +3,7 @@ The film model module Copyright 2017-2019, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ diff --git a/resources/lib/filmui.py b/resources/lib/filmui.py index 30f1f29..e7da207 100644 --- a/resources/lib/filmui.py +++ b/resources/lib/filmui.py @@ -3,7 +3,7 @@ The film model UI module Copyright 2017-2019, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ import os diff --git a/resources/lib/initialui.py b/resources/lib/initialui.py index 7a0b506..c67dc49 100644 --- a/resources/lib/initialui.py +++ b/resources/lib/initialui.py @@ -3,7 +3,7 @@ The initial grouping model UI module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=import-error diff --git a/resources/lib/kodi/kodiaddon.py b/resources/lib/kodi/kodiaddon.py index 9bb5474..14f77c1 100644 --- a/resources/lib/kodi/kodiaddon.py +++ b/resources/lib/kodi/kodiaddon.py @@ -3,7 +3,7 @@ The Kodi addons module Copyright 2017-2019, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ import os import sys diff --git a/resources/lib/kodi/kodilogger.py b/resources/lib/kodi/kodilogger.py index aab0cfc..d9cbc4d 100644 --- a/resources/lib/kodi/kodilogger.py +++ b/resources/lib/kodi/kodilogger.py @@ -3,7 +3,7 @@ The Kodi logger module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=import-error diff --git a/resources/lib/kodi/kodiui.py b/resources/lib/kodi/kodiui.py index ef1373e..5a5f545 100644 --- a/resources/lib/kodi/kodiui.py +++ b/resources/lib/kodi/kodiui.py @@ -3,7 +3,7 @@ The Kodi addons module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=import-error diff --git a/resources/lib/mvupdate.py b/resources/lib/mvupdate.py index ee05dc0..954d58d 100644 --- a/resources/lib/mvupdate.py +++ b/resources/lib/mvupdate.py @@ -3,7 +3,7 @@ The standalone update application environment module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/mvutils.py b/resources/lib/mvutils.py index 188c726..9448902 100644 --- a/resources/lib/mvutils.py +++ b/resources/lib/mvutils.py @@ -3,7 +3,7 @@ Utilities module Copyright (c) 2017-2019, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ from __future__ import unicode_literals diff --git a/resources/lib/notifier.py b/resources/lib/notifier.py index f0f0ff2..86725d7 100644 --- a/resources/lib/notifier.py +++ b/resources/lib/notifier.py @@ -3,7 +3,7 @@ UI Notifier module Copyright (c) 2017-2018, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py index 4b64a95..77aa9aa 100644 --- a/resources/lib/plugin.py +++ b/resources/lib/plugin.py @@ -3,7 +3,7 @@ The plugin module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/searches.py b/resources/lib/searches.py index 5e81f42..cc7e16b 100644 --- a/resources/lib/searches.py +++ b/resources/lib/searches.py @@ -2,7 +2,7 @@ Management of recent searches Copyright (c) 2018, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ import os diff --git a/resources/lib/service.py b/resources/lib/service.py index 3992af9..7bd13c3 100644 --- a/resources/lib/service.py +++ b/resources/lib/service.py @@ -3,7 +3,7 @@ The service module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/resources/lib/settings.py b/resources/lib/settings.py index 645325b..949ad7e 100644 --- a/resources/lib/settings.py +++ b/resources/lib/settings.py @@ -3,7 +3,7 @@ The addon settings module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ import time diff --git a/resources/lib/show.py b/resources/lib/show.py index c624cc7..b584f52 100644 --- a/resources/lib/show.py +++ b/resources/lib/show.py @@ -3,7 +3,7 @@ The show model module Copyright 2017-2019, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ diff --git a/resources/lib/showui.py b/resources/lib/showui.py index 7ff494e..8c3407e 100644 --- a/resources/lib/showui.py +++ b/resources/lib/showui.py @@ -3,7 +3,7 @@ The show model UI module Copyright 2017-2018, Leo Moll and Dominik Schlösser -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=import-error diff --git a/resources/lib/store.py b/resources/lib/store.py index 7c1f8fb..cf3aa30 100644 --- a/resources/lib/store.py +++ b/resources/lib/store.py @@ -3,7 +3,7 @@ The database wrapper module Copyright 2017-2019, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ import time diff --git a/resources/lib/storesqlite.py b/resources/lib/storesqlite.py index 3adc397..0255d02 100644 --- a/resources/lib/storesqlite.py +++ b/resources/lib/storesqlite.py @@ -3,7 +3,7 @@ The local SQlite database module Copyright 2017-2019, Leo Moll -Licensed under MIT License +SPDX-License-Identifier: MIT """ # pylint: disable=too-many-lines,line-too-long diff --git a/resources/lib/ttml2srt.py b/resources/lib/ttml2srt.py index 7ac7b00..e55b7f4 100644 --- a/resources/lib/ttml2srt.py +++ b/resources/lib/ttml2srt.py @@ -5,27 +5,7 @@ Copyright 2017 Laura Klünder See https://github.com/codingcatgirl/ttml2srt -MIT License - -Copyright (c) 2017 Laura Klünder - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SPDX-License-Identifier: MIT """ # Latest commit 2c361b5 on 29 Sep 2018 diff --git a/resources/lib/updater.py b/resources/lib/updater.py index b4af28c..ad9d9d4 100644 --- a/resources/lib/updater.py +++ b/resources/lib/updater.py @@ -3,6 +3,7 @@ The database updater module Copyright 2017-2019, Leo Moll and Dominik Schlösser +SPDX-License-Identifier: MIT """ # -- Imports ------------------------------------------------ diff --git a/service.py b/service.py index 1b4191a..575303e 100644 --- a/service.py +++ b/service.py @@ -1,29 +1,14 @@ # -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT """ The main service module MIT License -Copyright (c) 2017-2018, Leo Moll - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Copyright (c) 2017-2020, Leo Moll +""" -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -""" # -- Imports ------------------------------------------------ from resources.lib.service import MediathekViewService