xbmc · basrieter · Jul 7, 2024 · Aug 12, 2023
diff --git a/plugin.audio.tripler/LICENSE.txt b/plugin.audio.tripler/LICENSE.txt
@@ -1,3 +1,5 @@
+Copyright (c) 2023 Simon Mollema
+
 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
@@ -14,4 +16,4 @@ 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.
+THE SOFTWARE.
diff --git a/plugin.audio.tripler/README.md b/plugin.audio.tripler/README.md
@@ -0,0 +1,88 @@
+# plugin.audio.tripler
+
+A Kodi plugin for Triple R: an independent community radio station in Melbourne, Australia.
+
+![Triple R Logo](resources/icon.png)
+
+-----
+
+## Frequently Asked Questions
+
+### What is Triple R?
+
+For more than 40 years Triple R has shaped and inspired the culture of Melbourne. Since its inception as an educational broadcaster in 1976, Triple R has become Australia's most influential community radio station with nearly 21,000 paid subscribers and broadcasting live to over 1,000,000 listeners per month across FM and digital (DAB+ digital radio, podcasts and online).
+
+Broadcasting on 102.7FM and 3RRR Digital, the Triple R grid houses over 60 diverse programs. Music shows cover every genre imaginable from pop to punk rock, from R&B and electro to jazz, hip hop, country and metal. Specialist talks programs delve into topics as varied as the environment, human rights, politics, medical issues, gardening, cultural ventures and local interests.
+
+### What does this plugin do?
+
+This plugin aims to provide as much content as possible from the [Triple R Website, rrr.org.au,](https://www.rrr.org.au) in the Kodi media player. Currently provided are the following:
+
+- Listen Live!
+- Browse by Program
+- Browse by Date
+- Latest Segments
+- Audio Archives
+- Album Of The Week
+- Soundscapes
+- Events
+- Subscriber Giveaways (for logged in users only!)
+
+-----
+
+## Installation
+
+If you don't already use [Kodi](https://kodi.tv/), download and install that first.
+
+### Release Version
+
+If you would like to use the release version with automatic updates, please install [the published release in the Kodi repository](https://kodi.tv/addons/matrix/plugin.audio.tripler/) with the following steps:
+
+- Open Kodi.
+- Navigate to Add-ons > Install from Repository.
+- Navigate to Kodi Add-on repository > Music add-ons > Triple R.
+- Select "Install".
+
+### Latest Development Version
+
+If you would instead like to use the latest development version, [download the zip file](https://github.com/molzy/plugin.audio.tripler/archive/refs/heads/scraper.zip) to the same computer that is running Kodi. Afterwareds, follow these steps:
+
+- Open Kodi.
+- From the main menu, navigate to Settings > System > Add-ons.
+- Enable "Unknown Sources".
+- Go back to the main menu, and navigate to Add-ons > Install from Zip File.
+- If you are prompted to confirm, select "Yes" on the prompt.
+- Navigate to the downloaded zip file on your filesystem.
+- Select "OK".
+
+-----
+
+## Screenshots
+
+### Menu
+![Plugin Menu](resources/screenshots/menu.jpg)
+
+### Browse By Program
+![Browse By Program](resources/screenshots/browse-by-program.jpg)
+
+### Broadcast + Playlist
+![Broadcast + Playlist](resources/screenshots/broadcast-playlist.jpg)
+
+### Album Of The Week
+![Album Of The Week](resources/screenshots/album-of-the-week.jpg)
+
+### Browse By Date
+![Browse By Date](resources/screenshots/browse-by-date.jpg)
+
+### Soundscape
+![Soundscape](resources/screenshots/soundscape.jpg)
+
+-----
+
+## License
+
+This plugin was initially forked from a Triple R plugin written by [Damon Toumbourou](https://github.com/DamonToumbourou/plugin.audio.tripler). 
+
+The plugin was then fully rewritten by Simon Mollema.
+
+The plugin is released under the terms of [the MIT license](LICENSE.txt).
diff --git a/plugin.audio.tripler/addon.py b/plugin.audio.tripler/addon.py
@@ -1,4 +1,4 @@
 import resources.lib.tripler as tripler
 
 if __name__ == '__main__':
-    tripler.instance.run()
+    result = tripler.instance.parse()
diff --git a/plugin.audio.tripler/addon.xml b/plugin.audio.tripler/addon.xml
@@ -1,30 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.tripler" name="Triple R" version="2.0.0" provider-name="Simon Mollema">
+<addon id="plugin.audio.tripler" name="Triple R" version="3.0.0" provider-name="Simon Mollema">
 	<requires>
-		<import addon="xbmc.python" version="3.0.0"/>
-		<import addon="script.module.xbmcswift2" version="19.0.7"/>
-		<import addon="script.module.beautifulsoup4" version="4.9.3+matrix.1"/>
+		<import addon="xbmc.python" version="3.0.0" />
+		<import addon="script.module.pytz" version="2021.3.0+matrix.1" />
+		<import addon="script.module.beautifulsoup4" version="4.9.3+matrix.1" />
+		<import addon="plugin.video.youtube" version="6.8.18+matrix.1" optional="true" />
+		<import addon="plugin.audio.kxmxpxtx.bandcamp" version="0.4.1+matrix.1" optional="true" />
+		<import addon="plugin.audio.soundcloud" version="4.0.2" optional="true" />
+		<import addon="plugin.audio.indigitube" version="1.0.0" optional="true" />
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="addon.py">
 		<provides>audio</provides>
 	</extension>
 	<extension point="xbmc.addon.metadata">
 		<platform>all</platform>
 		<language>en</language>
-		<summary lang="en_GB">Listen to podcasts avaliable from the Triple R: Independent Melbourne Radio station.</summary>
+		<summary lang="en_GB">Listen to Triple R: an independent community radio station in Melbourne, Australia.</summary>
 		<description lang="en_GB">For more than 40 years Triple R has shaped and inspired the culture of Melbourne. Since its inception as an educational broadcaster in 1976, Triple R has become Australia's most influential community radio station with nearly 21,000 paid subscribers and broadcasting live to over 1,000,000 listeners per month across FM and digital (DAB+ digital radio, podcasts and online). Broadcasting on 102.7FM and 3RRR Digital, the Triple R grid houses over 60 diverse programs. Music shows cover every genre imaginable from pop to punk rock, from R&amp;B and electro to jazz, hip hop, country and metal. Specialist talks programs delve into topics as varied as the environment, human rights, politics, medical issues, gardening, cultural ventures and local interests.</description>
 		<license>MIT</license>
 		<email>[email protected]</email>
 		<source>https://github.com/molzy/plugin.audio.tripler</source>
-		<news>Version 2.0.0
-- Rewritten for Matrix / Python 3.
-- Now scraping media information directly from new Triple R website.
-
-Version 1.0.1
-- Initial working version</news>
+		<news>Version 3.0.0
+- Rewritten with more flexible parser
+- More content added from website
+- Improved user interface and menus
+- Browsing programs by name and date now possible
+- Broadcast track playlists are available
+- Support for playing music through Bandcamp, YouTube and indigiTUBE
+- Support for searching for music content by title and artist
+- Subscriber-only giveaways can now be entered by signing in
+		</news>
 		<assets>
 			<icon>resources/icon.png</icon>
 			<fanart>resources/fanart.png</fanart>
+			<screenshot>resources/screenshots/menu.jpg</screenshot>
+			<screenshot>resources/screenshots/browse-by-program.jpg</screenshot>
+			<screenshot>resources/screenshots/browse-by-date.jpg</screenshot>
+			<screenshot>resources/screenshots/broadcast-playlist.jpg</screenshot>
+			<screenshot>resources/screenshots/album-of-the-week.jpg</screenshot>
+			<screenshot>resources/screenshots/soundscape.jpg</screenshot>
 		</assets>
 	</extension>
 </addon>