Compatibilité Kodi19 & Python3

.gitignore

@@ -1,5 +1,8 @@
+/.vscode
+__pycache__
 .DS_Store
 update_repository.py
 /service.betaseries.com/lastdate.tmp
 /.vs
 *.sh
+

addons.xml

@@ -1,79 +1,133 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="service.subtitles.tvsubtitles" name="tvsubtitles.net" version="1.0.2" provider-name="skylex">
-	<requires>
-		<import addon="xbmc.python" version="2.1.0"/>
-		<import addon="script.module.beautifulsoup" version="3.2.1"/>
-	</requires>
-	<extension point="xbmc.subtitle.module" library="service.py" />
-	<extension point="xbmc.addon.metadata">
-		<platform>all</platform>
-		<summary lang="en">tvsubtitles.net subtitles service</summary>
-		<summary lang="fr">Service de sous-titres tvsubtitles.net</summary>
-		<description lang="en">Search and download subtitles from tvsubtitles.net</description>
-		<description lang="fr">Rechercher et télécharger des sous-titres depuis tvsubtitles.net</description>
-	</extension>
-</addon>
+	<addon id="service.subtitles.tvsubtitles" name="tvsubtitles.net" version="1.0.2" provider-name="skylex">
+		<requires>
+			<import addon="xbmc.python" version="2.1.0"/>
+			<import addon="script.module.beautifulsoup" version="3.2.1"/>
+		</requires>
+		<extension point="xbmc.subtitle.module" library="service.py" />
+		<extension point="xbmc.addon.metadata">
+			<platform>all</platform>
+			<summary lang="en">tvsubtitles.net subtitles service</summary>
+			<summary lang="fr">Service de sous-titres tvsubtitles.net</summary>
+			<description lang="en">Search and download subtitles from tvsubtitles.net</description>
+			<description lang="fr">Rechercher et télécharger des sous-titres depuis tvsubtitles.net</description>
+		</extension>
+	</addon>
 
-<addon id="service.subtitles.betaseries" name="Betaseries" version="1.0.8" provider-name="skylex">
-	<requires>
-		<import addon="xbmc.python" version="2.1.0"/>
-		<import addon="script.module.simplejson" version="2.0.10" />
-	</requires>
-	<extension point="xbmc.subtitle.module" library="service.py" />
-	<extension point="xbmc.addon.metadata">
-		<platform>all</platform>
-		<summary lang="en">BetaSeries subtitles service</summary>
-		<summary lang="fr">Service de sous-titres BetaSeries</summary>
-		<description lang="en">Search and download subtitles from BetaSeries.com</description>
-		<description lang="fr">Rechercher et télécharger des sous-titres depuis BetaSeries.com</description>
-	</extension>
-</addon>
+	<addon id="service.subtitles.betaseries" name="Betaseries" version="1.0.8" provider-name="skylex">
+		<requires>
+			<import addon="xbmc.python" version="2.1.0"/>
+			<import addon="script.module.simplejson" version="2.0.10" />
+		</requires>
+		<extension point="xbmc.subtitle.module" library="service.py" />
+		<extension point="xbmc.addon.metadata">
+			<platform>all</platform>
+			<summary lang="en">BetaSeries subtitles service</summary>
+			<summary lang="fr">Service de sous-titres BetaSeries</summary>
+			<description lang="en">Search and download subtitles from BetaSeries.com</description>
+			<description lang="fr">Rechercher et télécharger des sous-titres depuis BetaSeries.com</description>
+		</extension>
+	</addon>
 
-<addon id="service.betaseries.com" name="BetaSeries Agent" version="1.0.12" provider-name="skylex">
-	<requires>
-		<import addon="xbmc.python" version="2.12.0" />
-		<import addon="script.module.simplejson" version="2.0.10" />
-	</requires>
-	<extension point="xbmc.service" library="betaseries.py" start="login" />
-	<extension point="xbmc.addon.metadata">
-		<summary lang="en">Synchronization with BetaSeries.com</summary>
-		<summary lang="fr">Synchronisation avec BetaSeries.com</summary>
-		<description lang="en">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie on Kodi</description>
-		<description lang="fr">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou nu film dans Kodi</description>
-		<language></language>
-		<platform>all</platform>
-		<source>http://www.betaseries.com/wiki/Plugin%20XBMC</source>
-	</extension>
-</addon>
+	<addon id="service.betaseries.com" name="BetaSeries Agent" version="2.0.0" provider-name="skylex modded by kugan49">
+		<requires>
+			<import addon="xbmc.python" version="3.0.0" />
+			<!-- 0101 pour débug -->
+			<!-- <import addon="script.module.web-pdb" /> -->
+		</requires>
+		<extension point="xbmc.service" library="default.py"/>
+		<extension point="xbmc.addon.metadata" name="betaseries.metadata">
+			<summary lang="en_US">Synchronization with BetaSeries.com</summary>
+			<summary lang="fr_FR">Synchronisation avec BetaSeries.com</summary>
+			<description lang="en_US">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie or just uploaded it in on Kodi</description>
+			<description lang="fr_FR">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou un film dans Kodi ou que vous venez de l'ajouter</description>
+			<language></language>
+			<platform>all</platform>
+			<license> GPL-2.0-only</license>
+			<website>https://Betaseries.com</website>
+			<source>https://support.betaseries.com/article/38-les-applications-betaseries</source>
+			<news>
+				v2.0.0 (2021 02 23)
+				- refactoring for Kodi 19 Matrix
+			</news>
+			<assets>
+				<icon>icon.png</icon>
+				<fanart>fanart.png</fanart>
+			</assets>
+		</extension>
+	</addon>
 
-<addon id="service.subtitles.addic7ed" name="Addic7ed" version="1.0.8" provider-name="skylex">
-	<requires>
-		<import addon="xbmc.python" version="2.1.0"/>
-		<import addon="script.module.beautifulsoup" version="3.2.1"/>
-	</requires>
-	<extension point="xbmc.subtitle.module" library="service.py" />
-	<extension point="xbmc.addon.metadata">
-		<platform>all</platform>
-		<summary lang="en">Addic7ed subtitles service</summary>
-		<summary lang="fr">Service de sous-titres Addic7ed</summary>
-		<description lang="en">Search and download subtitles from Addic7ed.com</description>
-		<description lang="fr">Rechercher et télécharger des sous-titres depuis Addic7ed.com</description>
-	</extension>
-</addon>
+	<addon id="service.betaseries.com" name="BetaSeries Agent" version="1.0.14" provider-name="skylex modded by FG">
+		<requires>
+			<import addon="xbmc.python" version="2.12.0" />
+			<import addon="script.module.simplejson" version="2.0.10" />
+		</requires>
+		<extension point="xbmc.service" library="betaseries.py" start="login" />
+		<extension point="xbmc.addon.metadata">
+			<summary lang="en">Synchronization with BetaSeries.com</summary>
+			<summary lang="fr">Synchronisation avec BetaSeries.com</summary>
+			<description lang="en">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie on Kodi</description>
+			<description lang="fr">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou un film dans Kodi</description>
+			<language></language>
+			<platform>all</platform>
+			<source>https://support.betaseries.com/article/38-les-applications-betaseries</source>
+			<news>
+				v1.0.14 (2020/03/30)
+				- add compatibility with Netflix addon
+				- add compatibility with Catchuptv addon
+				- add pseudo compatibility with themoviedb (not recommended)
+				- fix search from title
+				- add some traductions
+				- change to Betaseries API v3.0 
+			</news>
+		</extension>
+	</addon>
 
-<addon id="repository.betaseries" name="BetaSeries Repository" version="1.0.0" provider-name="skylex">
-	<extension point="xbmc.addon.repository" name="BetaSeries Add-on Repository">
-		<info compressed="true">https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml</info>
-		<checksum>https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml.md5</checksum>
-		<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/master/</datadir>
-	</extension>
-	<extension point="xbmc.addon.metadata">
-		<summary>BetaSeries Add-on Repository</summary>
-		<description lang="en">This repository contains the BetaSeries.com add-on for XBMC and maintains it up to date</description>
-		<description lang="fr">Ce dépôt contient l'extension BetaSeries.com pour XBMC et permet de la maintenir à jour</description>
-                <disclaimer>If it breaks, you get to keep the pieces</disclaimer>
-		<platform>all</platform>
-	</extension>
-</addon>
+	<addon id="service.betaseries.com" name="BetaSeries Agent" version="1.0.13" provider-name="skylex modded by FG">
+		<requires>
+			<import addon="xbmc.python" version="2.12.0" />
+			<import addon="script.module.simplejson" version="2.0.10" />
+		</requires>
+		<extension point="xbmc.service" library="betaseries.py" start="login" />
+		<extension point="xbmc.addon.metadata">
+			<summary lang="en">Synchronization with BetaSeries.com</summary>
+			<summary lang="fr">Synchronisation avec BetaSeries.com</summary>
+			<description lang="en">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie on Kodi</description>
+			<description lang="fr">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou nu film dans Kodi</description>
+			<language></language>
+			<platform>all</platform>
+			<source>https://support.betaseries.com/article/38-les-applications-betaseries</source>
+			<news>
+				v1.0.13 (2020/03/24)
+				- convert from imbd_id to tvdb_id
+				- add auto-update from BS
+			</news>
+		</extension>
+	</addon>
+
+	<addon id="repository.betaseries" name="BetaSeries Repository" version="1.0.2" provider-name="skylex modded by FG">
+		<extension point="xbmc.addon.repository" name="BetaSeries Add-on Repository">
+		<dir minversion="17.0.0" maxversio="18.9.9">
+			<info compressed="false">https://raw.github.com/skylex/xbmc-betaseries/leia/addons.xml</info>
+			<checksum>https://raw.github.com/skylex/xbmc-betaseries/leia/addons.xml.md5</checksum>
+			<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/leia</datadir>
+		</dir>
+		<dir minversion="19.0.0">
+			<info compressed="false">https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml</info>
+			<checksum>https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml.md5</checksum>
+			<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/master</datadir>
+		</dir>
+		</extension>
+		<extension point="xbmc.addon.metadata">
+			<summary>BetaSeries Add-on Repository</summary>
+			<description lang="en">This repository contains the BetaSeries.com add-on for XBMC and maintains it up to date</description>
+			<description lang="fr">Ce dépôt contient l'extension BetaSeries.com pour XBMC et permet de la maintenir à jour</description>
+			<disclaimer>If it breaks, you get to keep the pieces</disclaimer>
+			<platform>all</platform>
+		</extension>
+		<assets>
+			<icon>icon.jpg</icon>
+		</assets>		
+	</addon>
 </addons>

addons.xml.md5

@@ -1 +1 @@
-36b8d1c242689b27643c91d4c47adf3a
+8e6bc84008dada18945fb8ffa79178a0  addons.xml

repository.betaseries/addon.xml

@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="repository.betaseries" name="BetaSeries Repository" version="1.0.0" provider-name="skylex">
+<addon id="repository.betaseries" name="BetaSeries Repository" version="1.0.2" provider-name="skylex modded by FG">
+    <requires>
+        <import addon="xbmc.addon" version="16.0.0"/>
+    </requires>
 	<extension point="xbmc.addon.repository" name="BetaSeries Add-on Repository">
-		<info compressed="true">https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml</info>
-		<checksum>https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml.md5</checksum>
-		<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/master/</datadir>
+        <dir minversion="16.0.0" maxversion="18.9.9">
+			<info compressed="false">https://raw.github.com/skylex/xbmc-betaseries/leia/addons.xml</info>
+			<checksum>https://raw.github.com/skylex/xbmc-betaseries/skylex/addons.xml.md5</checksum>
+			<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/leia</datadir>
+        </dir>
+        <dir minversion="19.0.0">
+			<info compressed="false">https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml</info>
+			<checksum>https://raw.github.com/skylex/xbmc-betaseries/master/addons.xml.md5</checksum>
+			<datadir zip="true">https://raw.github.com/skylex/xbmc-betaseries/master</datadir>
+        </dir>
 	</extension>
 	<extension point="xbmc.addon.metadata">
 		<summary>BetaSeries Add-on Repository</summary>
@@ -12,4 +22,7 @@
                 <disclaimer>If it breaks, you get to keep the pieces</disclaimer>
 		<platform>all</platform>
 	</extension>
+		<assets>
+			<icon>icon.jpg</icon>
+		</assets>
 </addon>

repository.betaseries/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    <html>
+    <head>
+     <title>Index of</title>
+    </head>
+    <body>
+    <h1>repository.betaseries</h1>
+    <table>
+            <tr><td><a href="repository.betaseries-1.0.1.zip">repository.betaseries-1.0.1.zip</a></td></tr>
+            <tr><td><a href="repository.betaseries-1.0.2.zip">repository.betaseries-1.0.2.zip</a></td></tr>
+    </table>
+    </body>
+</html>

service.betaseries.com/LICENSE.txt

@@ -1,13 +1,12 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -16,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -111,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -169,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -226,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -256,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -278,5 +277,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
--------------------------------------------------------------------------
+                     END OF TERMS AND CONDITIONS

service.betaseries.com/README.md

@@ -0,0 +1,8 @@
+BetaSeries sync for Kodi
+==========================
+
+Automatically update your Betaseries account from Kodi.
+Watching UnWatch or just added a movie or a TV episode and this add-on will update automatically into your betasseries account
+
+
+Thanks a lot to PCCV for the work they done : https://github.com/PCCV/xbmc-betaseries

service.betaseries.com/addon.xml

@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="service.betaseries.com" name="BetaSeries Agent" version="1.0.12" provider-name="skylex">
-	<requires>
-		<import addon="xbmc.python" version="2.12.0" />
-		<import addon="script.module.simplejson" version="2.0.10" />
-	</requires>
-	<extension point="xbmc.service" library="betaseries.py" start="login" />
-	<extension point="xbmc.addon.metadata">
-		<summary lang="en">Synchronization with BetaSeries.com</summary>
-		<summary lang="fr">Synchronisation avec BetaSeries.com</summary>
-		<description lang="en">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie on Kodi</description>
-		<description lang="fr">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou nu film dans Kodi</description>
-		<language></language>
-		<platform>all</platform>
-		<source>http://www.betaseries.com/wiki/Plugin%20XBMC</source>
-	</extension>
+<addon id="service.betaseries.com" name="BetaSeries Agent" version="2.0.0" provider-name="kugan49">
+    <requires>
+        <import addon="xbmc.python" version="3.0.0" />
+        <!-- 0101 pour débug -->
+        <!-- <import addon="script.module.web-pdb" /> -->
+    </requires>
+    <extension point="xbmc.service" library="default.py"/>
+    <extension point="xbmc.addon.metadata" name="betaseries.metadata">
+        <summary lang="en_US">Synchronization with BetaSeries.com</summary>
+        <summary lang="fr_FR">Synchronisation avec BetaSeries.com</summary>
+        <description lang="en_US">This service automatically updates your profile on BetaSeries.com when you have finished watching an episode or a movie or just uploaded it in on Kodi</description>
+        <description lang="fr_FR">Ce service met à jour automatiquement votre profil sur le site BetaSeries.com lorsque vous venez de finir de regarder un épisode ou un film dans Kodi ou que vous venez de l'ajouter</description>
+        <language></language>
+        <platform>all</platform>
+        <license> GPL-2.0-only</license>
+        <website>https://Betaseries.com</website>
+        <source>https://github.com/skylex/xbmc-betaseries</source>
+        <news>
+	v2.0.0 (2021 02 23)
+	  - refactoring for Kodi 19 Matrix
+        </news>
+        <assets>
+            <icon>icon.png</icon>
+            <fanart>fanart.png</fanart>
+        </assets>
+    </extension>
 </addon>