changed: move scraper libraries to cpluff

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30469 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

14 files changed, 141 insertions, 160 deletions

diff --git a/addons/metadata.allmusic.com/description.xml b/addons/metadata.allmusic.com/addon.xml
index dbdbba2a8e..667cf2a273 100644
--- a/addons/metadata.allmusic.com/description.xml
+++ b/addons/metadata.allmusic.com/addon.xml
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.allmusic.com</id>
-  <type>scraper</type>
-  <title>AllMusic</title>
-  <library>allmusic.xml</library>
-  <version>1.0.0</version>
-  <platforms>
+<addon id="metadata.allmusic.com"
+       name="AllMusic"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+    <import addon="metadata.common.last.fm" version="1.0"/>
+    <import addon="metadata.common.allmusic.com" version="1.0"/>
+    <import addon="metadata.common.htbackdrops.com" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper"
+             library="allmusic.xml"/>
+  <extension point="xbmc.addon.metadata">
     <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>AllMusic Scraper</summary>
-  <description>Use AllMusic.com to fill your libray metadata information.
+    <minversion>20000</minversion>
+    <summary>AllMusic Scraper</summary>
+    <description>Use AllMusic.com to fill your libray metadata information.
 The allmusic website was created in 1995 as a place for music fans to indulge their passion.
 The AMG editorial staff, along with hundreds of expert contributors (all music fanatics in their own right), has made allmusic the most comprehensive music reference source on the planet. They are all dedicated to creating and maintaining the knowledgeable, spirited content that music lovers and industry professionals have come to expect from AMG.
 All genres and styles of music are covered here, ranging from the most commercially popular to the most obscure. We critique albums and artists within the context of their own genres - from opera to garage rock to traditional country. This ensures that fans of any style of music can depend on us to keep them up-to-date with their favorite artists as well as introduce them to new sounds.</description>
- <description lang="nl">Gebruik AllMusic.com om de metadata van jouw collectie op te halen.
+   <description lang="nl">Gebruik AllMusic.com om de metadata van jouw collectie op te halen.
   De AllMusic website is ontstaan in 1995 als webstek voor echte muziekfans.
 The AMG redactie, samen met honderden bijdragende experen (allen muziekfans in hun eigen gebied), hebben van allmusic het meest complete muziek naslagwerk gemaakt op deze planeet.
 Alle genres en stijlen worden gedekt, gaande van de meest commerciele tot de meest alternatieve. We bekritiseren albums en artiesten in hun eigen genre, van opera tot garagerock tot traditionele country. Dit maakt dat fans van elke muziekstijl bij ons terecht kunnen voor de laatste informatie rond hun favoriete artiesten of om nieuwe muziek te leren ontdekken.</description>
-  <author>Team XBMC</author>
-  <dependencies>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.last.fm</dependency>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.allmusic.com</dependency>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.discogs.com</dependency>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.htbackdrops.com</dependency>
-  </dependencies>
-  <supportedcontent>
-    <content>albums</content>
-    <content>artists</content>
-  </supportedcontent>
-</addoninfo>
+    <supportedcontent>
+      <content>albums</content>
+      <content>artists</content>
+    </supportedcontent>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml
new file mode 100644
index 0000000000..db0bcd7985
--- /dev/null
+++ b/addons/metadata.common.allmusic.com/addon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.allmusic.com"
+       name="AllMusic"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.library"
+             library="allmusic.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>AllMusic Music Scraper</summary>
+    <summary lang="nl">AllMusic Muziek Scraper</summary>
+    <description>Download Music information from www.allmusic.com</description>
+    <description lang="nl">Download muziek informatie van www.allmusic.com</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.allmusic.com/description.xml b/addons/metadata.common.allmusic.com/description.xml
deleted file mode 100644
index 0665e1260b..0000000000
--- a/addons/metadata.common.allmusic.com/description.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.common.allmusic.com</id>
-  <type>scraper-library</type>
-  <title>AllMusic</title>
-  <library>allmusic.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>AllMusic Music Scraper</summary>
-  <summary lang="nl">AllMusic Muziek Scraper</summary>
-  <description>Download Music information from www.allmusic.com</description>
-  <description lang="nl">Download muziek informatie van www.allmusic.com</description>
-  <author>TEAMXBMC</author>
-  <supportedcontent>
-    <content>albums</content>
-    <content>artists</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/metadata.common.dtrailer.com/addon.xml b/addons/metadata.common.dtrailer.com/addon.xml
new file mode 100644
index 0000000000..c501eb293f
--- /dev/null
+++ b/addons/metadata.common.dtrailer.com/addon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.dtrailer.com"
+       name="DTrailer common scraper functions"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.library"
+             library="dtrailer.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>DTrailer Scraper Library</summary>
+    <summary lang="nl">DTralier Scraper Collectie</summary>
+    <description>Download trailers from www.themoviedb.org</description>
+    <description lang="nl">Download trailers van www.themoviedb.org</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.dtrailer.com/description.xml b/addons/metadata.common.dtrailer.com/description.xml
deleted file mode 100644
index 45184412c7..0000000000
--- a/addons/metadata.common.dtrailer.com/description.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.common.dtrailer.com</id>
-  <type>scraper-library</type>
-  <title>DTrailer</title>
-  <library>dtrailer.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>DTrailer Scraper Library</summary>
-  <description>some description</description>
-  <author>TEAMXBMC</author>
-  <supportedcontent>
-    <content>movies</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/metadata.common.htbackdrops.com/addon.xml b/addons/metadata.common.htbackdrops.com/addon.xml
new file mode 100644
index 0000000000..27b285b173
--- /dev/null
+++ b/addons/metadata.common.htbackdrops.com/addon.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.htbackdrops.com"
+       name="HTBackdrops"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.library"
+             library="htbackdrops.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>HTBackdrops Scraper Library</summary>
+    <description>some description</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.htbackdrops.com/description.xml b/addons/metadata.common.htbackdrops.com/description.xml
deleted file mode 100644
index 0b823286d7..0000000000
--- a/addons/metadata.common.htbackdrops.com/description.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.common.htbackdrops.com</id>
-  <type>scraper-library</type>
-  <title>HTBackdrops</title>
-  <library>htbackdrops.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>HTBackdrops Scraper Library</summary>
-  <description>some description</description>
-  <author>TEAMXBMC</author>
-  <supportedcontent>
-    <content>movies</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/metadata.common.last.fm/addon.xml b/addons/metadata.common.last.fm/addon.xml
new file mode 100644
index 0000000000..5f198dd442
--- /dev/null
+++ b/addons/metadata.common.last.fm/addon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.last.fm"
+       name="Last.FM"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.library"
+             library="lastfm.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>LastFM Scraper Library</summary>
+    <summary lang="nl">LastFM Scraper Collectie</summary>
+    <description>Download Music information</description>
+    <description lang="nl">Download muziek informatie</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.last.fm/description.xml b/addons/metadata.common.last.fm/description.xml
deleted file mode 100644
index 48b117abbe..0000000000
--- a/addons/metadata.common.last.fm/description.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.common.last.fm</id>
-  <type>scraper-library</type>
-  <title>LastFM</title>
-  <library>lastfm.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>LastFM Scraper Library</summary>
-  <summary lang="nl">LastFM Scraper Collectie</summary>
-  <description>Download Music information</description>
-  <description lang="nl">Download muziek informatie</description>
-  <author>TEAMXBMC</author>
-  <supportedcontent>
-    <content>albums</content>
-    <content>artists</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml
new file mode 100644
index 0000000000..a5c59e0d44
--- /dev/null
+++ b/addons/metadata.common.themoviedb.org/addon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.themoviedb.org"
+       name="The MovieDB common scraper functions"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.library"
+             library="tmdb.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>TMDb Scraper Library</summary>
+    <summary lang="nl">TMDb Scraper Collectie</summary>
+    <description>Download thumbs and fanarts from www.themoviedb.org</description>
+    <description lang="nl">Download afbeeldingen en fanart van www.themoviedb.org</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.common.themoviedb.org/description.xml b/addons/metadata.common.themoviedb.org/description.xml
deleted file mode 100644
index 012a5624a7..0000000000
--- a/addons/metadata.common.themoviedb.org/description.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.common.themoviedb.org</id>
-  <type>scraper-library</type>
-  <title>TMDb</title>
-  <library>tmdb.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>TMDb Scraper Library</summary>
-  <summary lang="nl">TMDb Scraper Collectie</summary>
-  <description>Download thumbs and fanarts from www.themoviedb.org</description>
-  <description lang="nl">Download afbeeldingen en fanart van www.themoviedb.org</description>
-  <author>TEAMXBMC</author>
-  <supportedcontent>
-    <content>movies</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
new file mode 100644
index 0000000000..3a968de544
--- /dev/null
+++ b/addons/metadata.themoviedb.org/addon.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.themoviedb.org"
+       name="The MovieDB"
+       version="1.0.0"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+    <import addon="metadata.common.themoviedb.org" version="1.0"/>
+    <import addon="metadata.common.dtrailer.com" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper"
+             library="tmdb.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <platform>all</platform>
+    <minversion>20000</minversion>
+    <summary>TMDB Movie Scraper</summary>
+    <summary lang="nl">TMDB Film Scraper</summary>
+    <description>themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their and powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the users experience</description>
+    <description lang="nl">themoviedb.org is een vrije en open film databank. Het wordt compleet aangedreven door gebruikers zoals jezelf. TMDb wordt momenteel maandelijks gebruikt door miljoenen mensen. Hun krachtige API maakt het voor mediaspelers zoals XBMC mogelijk om voor een film bijkomende informatie, posters en fanarts op te halen.</description>
+    <supportedcontent>
+      <content>movies</content>
+    </supportedcontent>
+  </extension>
+</addon>
diff --git a/addons/metadata.themoviedb.org/description.xml b/addons/metadata.themoviedb.org/description.xml
deleted file mode 100644
index eac4b4d307..0000000000
--- a/addons/metadata.themoviedb.org/description.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>metadata.themoviedb.org</id>
-  <type>scraper</type>
-  <title>TMDB</title>
-  <library>tmdb.xml</library>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>all</platform>
-  </platforms>
-  <minversion>
-    <xbmc>20000</xbmc>
-  </minversion>
-  <summary>TMDB Movie Scraper</summary>
-  <summary lang="nl">TMDB Film Scraper</summary>
-  <description>themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their and powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the users experience</description>
-  <description lang="nl">themoviedb.org is een vrije en open film databank. Het wordt compleet aangedreven door gebruikers zoals jezelf. TMDb wordt momenteel maandelijks gebruikt door miljoenen mensen. Hun krachtige API maakt het voor mediaspelers zoals XBMC mogelijk om voor een film bijkomende informatie, posters en fanarts op te halen.</description>
-  <author>Team XBMC</author>
-  <dependencies>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.themoviedb.org</dependency>
-    <dependency minversion="1.0.0" maxversion="">metadata.common.dtrailer.com</dependency>
-  </dependencies>
-  <supportedcontent>
-    <content>movies</content>
-  </supportedcontent>
-</addoninfo>
diff --git a/addons/xbmc.metadata/addon.xml b/addons/xbmc.metadata/addon.xml
index a9ea02511e..8e252039cd 100644
--- a/addons/xbmc.metadata/addon.xml
+++ b/addons/xbmc.metadata/addon.xml
@@ -4,4 +4,5 @@
     <import addon="xbmc.core" version="0.1"/>
   </requires>
   <extension-point id="scraper" schema="scraper.xsd"/>
+  <extension-point id="scraper.library" schema="scraper.xsd"/>
 </addon>