The branch, dharma has been updated
       via  d92399714b44750ddc67643bae3e883aa46c39ac (commit)
      from  972319e92c94cd3f60c3f554431596a91ec5d094 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=d92399714b44750ddc67643bae3e883aa46c39ac

commit d92399714b44750ddc67643bae3e883aa46c39ac
Author: olympia <[email protected]>
Date:   Mon Apr 4 07:47:46 2011 +0200

    [metadata.anidb.net] updated to version 1.1.0

diff --git a/metadata.anidb.net/addon.xml b/metadata.anidb.net/addon.xml
index 1c7f50e..8d6cf12 100644
--- a/metadata.anidb.net/addon.xml
+++ b/metadata.anidb.net/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.anidb.net"
        name="AniDB.net"
-       version="1.0.0"
+       version="1.1.0"
        provider-name="bambi">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.anidb.net/anidb.xml b/metadata.anidb.net/anidb.xml
index c206c4a..d26e183 100644
--- a/metadata.anidb.net/anidb.xml
+++ b/metadata.anidb.net/anidb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<scraper framework="1.1" date="2010-01-10">

+<scraper framework="1.1" date="2011-04-02">

 

   <NfoUrl dest="3">         

     <RegExp input="$$1" output="&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;";
 dest="3">

@@ -9,42 +9,30 @@
   

   <CreateSearchUrl clearbuffers="no" dest="4">  

     <RegExp conditional="Google" input="$$4" output="&lt;url 
gzip=&quot;yes&quot;&gt;http://www.google.com/search?q=site:anidb.net\1&amp;filter=0&lt;/url&gt;";
 dest="4">

-      <RegExp input="$$1%20" output="+\1" dest="4">

-        <expression clear="yes" 
repeat="yes">(?i)([a-z0-9]*?)(%[a-f0-9]{2})+</expression>

+      <RegExp input="$$1" output="+\1" dest="4">

+        <expression clear="yes" 
repeat="yes">(?i)(?:%[a-f0-9]{2})*([a-z0-9]+)?</expression>

       </RegExp>

-      <!--RegExp input="$$1" output="+\1" dest="4">

-        <expression clear="yes" 
repeat="yes">(?i)(?:%[a-f0-9]{2})*([a-z0-9]+)</expression>

-      </RegExp-->

       <expression clear="yes" noclean="1"/>

     </RegExp> 

-    <RegExp conditional="!Google" input="$$1" output="&lt;url 
gzip=&quot;yes&quot; 
cache=&quot;anidb.xml&quot;&gt;http://sites.google.com/site/anidblist/anidb.xml&lt;/url&gt;";
 dest="4">

+    <RegExp conditional="!Google" input="$$1" output="&lt;url 
gzip=&quot;yes&quot; 
cache=&quot;anidb.xml&quot;&gt;$INFO[AnimeListUrl]&lt;/url&gt;" dest="4">

       <RegExp input="$$1" output="\1" dest="18">

-        <expression clear="yes" repeat="yes"/>

+        <expression clear="yes"/>

       </RegExp>

       <expression clear="yes"/>

     </RegExp>

+    <RegExp input="" output="" dest="1">

+      <expression clear="yes"/>

+    </RegExp>

   </CreateSearchUrl>

   

   <GetSearchResults clearbuffers="no" dest="4">

     <RegExp input="$$4" output="&lt;results&gt;\1&lt;/results&gt;" dest="4">

-      <RegExp conditional="Google" input="$$6" output="\1" dest="4">

-        <RegExp input="$$1" 
output="&lt;anidbid&gt;\1&lt;/anidbid&gt;&lt;title&gt;\2&lt;/title&gt;" 
dest="5">

-          <expression clear="yes" repeat="yes">(?i)&lt;a 
href=&quot;http://anidb\.net/perl-bin/animedb\.pl\?show=anime&amp;aid=(\d+)&quot;[^&gt;]*&gt;(.*?)&lt;/a&gt;</expression>

-        </RegExp>

-        <RegExp input="$$1" 
output="&lt;anidbid&gt;\1&lt;/anidbid&gt;&lt;title&gt;\2&lt;/title&gt;" 
dest="5+">

-          <expression repeat="yes">(?i)&lt;a 
href=&quot;http://anidb\.net/a(\d+)&quot;[^&gt;]*&gt;(.*?)&lt;/a&gt;</expression>

-        </RegExp>

-        <RegExp input="$$5" output="&lt;entity&gt;&lt;title&gt;Google Search : 
A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="6">

-           <expression clear="yes" 
repeat="yes">(?i)&lt;anidbid&gt;(\d+)&lt;/anidbid&gt;&lt;title&gt;(?!anidb\.net)([^&lt;]*)&lt;/title&gt;</expression>

+      <RegExp conditional="Google" input="$$4" output="\1" dest="4">

+        <RegExp input="$$1" output="&lt;url 
function=&quot;GetSearchResultsExt&quot; gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;";
 dest="4">

+          <expression clear="yes" repeat="yes">(?i)&lt;a 
href=&quot;http://anidb\.net/perl-bin/animedb\.pl\?show=anime&amp;amp;aid=(\d+)&quot;</expression>

         </RegExp>

-        <RegExp input="$$5" output="&lt;url 
function=&quot;GetSearchResultsExt&quot; gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;";
 dest="6+">

-           
<expression>(?i)&lt;anidbid&gt;(\d+)&lt;/anidbid&gt;&lt;title&gt;(?=anidb\.net)[^&lt;]*&lt;/title&gt;</expression>

-        </RegExp>

-        <RegExp input="$$5" output="\1" dest="20">

-           <expression clear="yes" 
noclean="1">(?i)&lt;anidbid&gt;\d+&lt;/anidbid&gt;&lt;title&gt;(?=anidb\.net)[^&lt;]*&lt;/title&gt;((?:&lt;anidbid&gt;\d+&lt;/anidbid&gt;&lt;title&gt;(?=anidb\.net)[^&lt;]*&lt;/title&gt;)*)</expression>

-        </RegExp>

-        <RegExp input="" output="\1" dest="19">

-          <expression/>

+        <RegExp input="$$1" output="&lt;url 
function=&quot;GetSearchResultsExt&quot; gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;";
 dest="4+">

+          <expression repeat="yes">(?i)&lt;a 
href=&quot;http://anidb\.net/a(\d+)&quot;</expression>

         </RegExp>

         <expression noclean="1"/>

       </RegExp> 

@@ -53,33 +41,42 @@
           <expression clear="yes" 
repeat="yes">(?i)([a-z0-9]+)(?:%[a-f0-9]{2})*</expression>

         </RegExp>

         <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;Anidb Search : 
A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5">

-          <expression clear="yes" repeat="yes">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;main&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

+          <expression clear="yes" repeat="yes" trim="2">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;main&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

         </RegExp>

-        <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;Anidb Search : 
A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">

-          <expression repeat="yes">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;official&quot;\s+xml:lang=&quot;en&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

+        <RegExp conditional="OfficalName" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;Anidb Search : A\1 ~ \2&lt;/title&gt;&lt;url 
gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">

+          <expression repeat="yes" trim="2">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;official&quot;\s+xml:lang=&quot;$INFO[OfficalLanguage]&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

+        </RegExp>

+        <RegExp conditional="!OfficalName" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;Anidb Search : A\1 ~ \2&lt;/title&gt;&lt;url 
gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">

+          <expression repeat="yes" trim="2">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;official&quot;\s+xml:lang=&quot;en&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

         </RegExp>

         <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;Anidb Search : 
A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">

-          <expression repeat="yes">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;syn&quot;\s+xml:lang=&quot;x-jat&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

+          <expression repeat="yes" trim="2">&lt;anime 
aid=&quot;(\d+)&quot;&gt;(?:[^&lt;]*&lt;title[^&lt;]+&lt;/title&gt;)*[^&lt;]*&lt;title\s+type=&quot;syn&quot;\s+xml:lang=&quot;x-jat&quot;[^&gt;]*&gt;([^&lt;]*$$6[^&lt;]*)&lt;/title&gt;</expression>

         </RegExp>

         <expression noclean="1"/>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetSearchResults>

 

   <GetSearchResultsExt clearbuffers="no" dest="4">

     <RegExp input="$$4" output="&lt;results&gt;\1&lt;/results&gt;" dest="4">

-      <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;Google Search : 
A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="19+">

-        <expression 
trim="2">&lt;anime.*?id=&quot;(\d+)&quot;.*?&lt;title.*?type=&quot;main&quot;&gt;([^&lt;]+)</expression>

+      <RegExp input="$$1" output="\1" dest="20">

+        <expression 
clear="yes">(?i)&lt;anime\s+id=&quot;(\d+)&quot;</expression>

       </RegExp>

-      <RegExp input="$$19" output="\1" dest="4">

-        <expression noclean="1"/>

+      <RegExp input="$$1" output="\1" dest="19">

+        <expression clear="yes" 
trim="1">(?i)&lt;title.*?type=&quot;main&quot;&gt;([^&lt;]+)&lt;/title&gt;</expression>

       </RegExp>

-      <RegExp input="$$20" output="&lt;url 
function=&quot;GetSearchResultsExt&quot; gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;";
 dest="4">

-         
<expression>(?i)&lt;anidbid&gt;(\d+)&lt;/anidbid&gt;&lt;title&gt;[^&lt;]*&lt;/title&gt;</expression>

+      <RegExp conditional="OfficalName" input="$$1" output="\1" dest="19">

+        <expression 
trim="1">(?i)&lt;title\s+xml:lang=&quot;$INFO[OfficalLanguage]&quot;\s+type=&quot;official&quot;&gt;([^&lt;]+)&lt;/title&gt;</expression>

       </RegExp>

-      <RegExp input="$$20" output="\1" dest="20">

-         <expression clear="yes" 
noclean="1">(?i)&lt;anidbid&gt;\d+&lt;/anidbid&gt;&lt;title&gt;[^&lt;]*&lt;/title&gt;((?:&lt;anidbid&gt;\d+&lt;/anidbid&gt;&lt;title&gt;[^&lt;]*&lt;/title&gt;)*)</expression>

+      <RegExp input="$$20-$$19" output="&lt;entity&gt;&lt;title&gt;Google 
Search : A\1 ~ \2&lt;/title&gt;&lt;url gzip=&quot;yes&quot; 
cache=&quot;\1.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="4">

+        <expression clear="yes">(\d+)-(.+)</expression>

+      </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

       </RegExp>

       <expression noclean="1"/>

     </RegExp>

@@ -90,23 +87,47 @@
       <RegExp input="$$1" output="\1" dest="20">

         <expression noclean="1"/>

       </RegExp>

-      <RegExp input="$$1" output="&lt;url function=&quot;GetDetailsExt&quot; 
cache=&quot;anime-list.xml&quot;&gt;http://sites.google.com/site/anidblist/anime-list.xml&lt;/url&gt;";
 dest="8">

+      <RegExp input="" output="" dest="8">

+        <expression clear="yes"/>

+      </RegExp>

+      <RegExp conditional="PersonalAnimeMapping" input="" output="&lt;url 
function=&quot;GetPersonalAnimeMapping&quot; 
cache=&quot;pers-anime-list.xml&quot;&gt;$INFO[PersonalAnimeMappingUrl]&lt;/url&gt;"
 dest="8+">

         <expression/>

       </RegExp>

+      <RegExp input="" output="&lt;url function=&quot;GetDetailsExt&quot; 
cache=&quot;anime-list.xml&quot;&gt;$INFO[AnimeMappingUrl]&lt;/url&gt;" 
dest="8+">

+        <expression/>

+      </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

+      <RegExp input="" output="" dest="2">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetDetails>

 

+  <GetPersonalAnimeMapping clearbuffers="no" dest="3">

+    <RegExp input="" output="&lt;details&gt;&lt;/details&gt;" dest="3">

+      <RegExp input="$$1" output="\1" dest="2">

+        <expression noclean="1"/>

+      </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

+      <expression noclean="1"/>

+    </RegExp>

+  </GetPersonalAnimeMapping>

+

   <GetDetailsExt clearbuffers="no" dest="3">

     <RegExp input="$$8" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">

-      <RegExp input="$$1" output="\1" dest="2">

+      <RegExp input="$$2$$1" output="\1" dest="2">

         <expression noclean="1"/>

       </RegExp>

       <RegExp input="$$20" output="\1" dest="1">

         <expression noclean="1"/>

       </RegExp>

       <RegExp input="$$1" output="\1" dest="20">

-        <expression clear="yes">(?i)&lt;anime id=&quot;(\d+)&quot;</expression>

+        <expression 
clear="yes">(?i)&lt;anime\s+id=&quot;(\d+)&quot;</expression>

       </RegExp>

       <RegExp input="$$2" output="\1" dest="19">

         <expression clear="yes" 
noclean="1">(?i)(&lt;anime\s+anidbid=&quot;$$20&quot;.*?&lt;/anime&gt;)</expression>

@@ -117,15 +138,24 @@
       <RegExp input="$$19" output="\1" dest="17">

         <expression clear="yes" 
noclean="1">(?i)(&lt;supplemental-info(?!\s+replace=&quot;(?:true|yes)&quot;)[^&gt;]*&gt;.*?&lt;/supplemental-info&gt;)</expression>

       </RegExp>

-                       <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="8">

+      <RegExp conditional="OfficalName" input="$$1" output="\1" dest="15">

+        <expression clear="yes" 
trim="1">(?i)&lt;title\s+xml:lang=&quot;$INFO[OfficalLanguage]&quot;\s+type=&quot;official&quot;&gt;([^&lt;]+)&lt;/title&gt;</expression>

+      </RegExp>

+      <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="8">

         <expression clear="yes" 
trim="1">(?i)&lt;title.*?type=&quot;main&quot;&gt;([^&lt;]+)&lt;/title&gt;</expression>

       </RegExp>

+      <RegExp conditional="OfficalName" input="$$15" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="8">

+        <expression noclean="1">(.+)</expression>

+      </RegExp>

       <RegExp input="$$18" output="\1" dest="8">

         <expression 
noclean="1">(?i)(&lt;title&gt;.*?&lt;/title&gt;)</expression>

       </RegExp>

-      <RegExp input="$$1" 
output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="16">

+      <RegExp conditional="!OfficalName" input="$$1" 
output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="16">

         <expression clear="yes" 
trim="1">(?i)&lt;title\s+xml:lang=&quot;en&quot;\s+type=&quot;official&quot;&gt;([^&lt;]+)&lt;/title&gt;</expression>

       </RegExp>

+      <RegExp conditional="OfficalName" input="$$15" 
output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="16">

+        <expression noclean="1">(.+)</expression>

+      </RegExp>

       <RegExp input="$$18" output="\1" dest="16">

         <expression 
noclean="1">(?i)(&lt;originaltitle&gt;.*?&lt;/originaltitle&gt;)</expression>

       </RegExp>

@@ -513,10 +543,13 @@
       <RegExp input="$$6" output="\1" dest="8+">

         <expression noclean="1"/>

       </RegExp>

-      <RegExp input="" output="\1" dest="16">

+      <RegExp input="" output="" dest="1">

         <expression clear="yes"/>

       </RegExp>

-      <RegExp input="" output="\1" dest="15">

+      <RegExp input="" output="" dest="16">

+        <expression clear="yes"/>

+      </RegExp>

+      <RegExp input="" output="" dest="15">

         <expression clear="yes"/>

       </RegExp>

       <RegExp input="true" output="\1" dest="14">

@@ -617,6 +650,9 @@
         </RegExp>

         <expression clear="yes">(\d+)</expression>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>              

   </GetTVDBLookupAPI>

@@ -647,6 +683,9 @@
       <RegExp input="$$4" output="\1" dest="17">

         <expression>()\Q$$6\E</expression>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetTVDBLookupLoopAPI>

@@ -659,12 +698,18 @@
       <RegExp input="$$1" output="&lt;url 
function=&quot;GetFanartDataAPI&quot; 
cache=&quot;tvdb-$$20.xml&quot;&gt;http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/en.zip&lt;/url&gt;";
 dest="4">

         <expression>(?i)&lt;seriesid&gt;(\d+)&lt;/seriesid&gt;</expression>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetFanartAPI>

 

   <GetFanartDataReturnAPI clearbuffers="no" dest="4">

     <RegExp input="$$16$$15" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetFanartDataReturnAPI>

@@ -716,11 +761,14 @@
       <RegExp conditional="!NoFanartContinue" input="$$16" output="&lt;url 
function=&quot;GetFanartDataReturnAPI&quot; 
cache=&quot;$$20.xml&quot;&gt;&amp;&lt;/url&gt;" dest="4">

         <expression/>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetFanartDataAPI>

   

-  <GetEpisodeList dest="4">

+  <GetEpisodeList clearbuffers="yes" dest="4">

     <RegExp input="$$8" output="&lt;episodeguide&gt;\1&lt;/episodeguide&gt;" 
dest="4">

       <RegExp input="$$1" output="\1" dest="20">

         <expression>&lt;anime id=&quot;(\d+)&quot;</expression>

@@ -785,9 +833,18 @@
       <RegExp input="$$1" output="\1" dest="20">

         <expression clear="yes">(?i)&lt;anime id=&quot;(\d+)&quot;</expression>

       </RegExp>

-      <RegExp input="$$20" output="&lt;url 
function=&quot;GetEpisodeMappingXMLAPI&quot; 
cache=&quot;anime-list.xml&quot;&gt;http://sites.google.com/site/anidblist/anime-list.xml&lt;/url&gt;";
 dest="4+">

+      <RegExp conditional="PersonalAnimeMapping" input="" output="&lt;url 
function=&quot;GetPersonalAnimeMapping&quot; 
cache=&quot;pers-anime-list.xml&quot;&gt;$INFO[PersonalAnimeMappingUrl]&lt;/url&gt;"
 dest="4+">

+        <expression/>

+      </RegExp>

+      <RegExp input="" output="&lt;url 
function=&quot;GetEpisodeMappingXMLAPI&quot; 
cache=&quot;anime-list.xml&quot;&gt;$INFO[AnimeMappingUrl]&lt;/url&gt;" 
dest="4+">

         <expression/>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

+      <RegExp input="" output="" dest="2">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>   

   </GetEpisodeDetails>

@@ -807,7 +864,7 @@
 

   <GetEpisodeMappingXMLAPI clearbuffers="no" dest="4">

     <RegExp input="$$4" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">

-      <RegExp input="$$1" output="\1" dest="6">

+      <RegExp input="$$2$$1" output="\1" dest="6">

         <expression clear="yes" 
noclean="1">(?i)(&lt;anime\s+anidbid=&quot;$$20&quot;.*?&lt;/anime&gt;)</expression>

       </RegExp>

       <RegExp input="$$6" output="\1" dest="7">

@@ -858,13 +915,16 @@
         </RegExp>

         <expression>(\d+)</expression>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>

     </RegExp>

   </GetEpisodeMappingXMLAPI>

   

   <GetEpisodeReverseMappingXMLAPI clearbuffers="no" dest="4">

     <RegExp input="$$4" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">

-      <RegExp input="$$1" output="\1" dest="6">

+      <RegExp input="$$2$$1" output="\1" dest="6">

         <expression clear="yes" 
noclean="1">(?i)(&lt;anime\s+anidbid=&quot;$$20&quot;.*?&lt;/anime&gt;)</expression>

       </RegExp>

       <RegExp input="$$6" output="1" dest="19">

@@ -882,6 +942,9 @@
       <RegExp input="$$19-$$18" 
output="&lt;displayseason&gt;1&lt;/displayseason&gt;&lt;displayepisode&gt;\1&lt;/displayepisode&gt;"
 dest="4">

         <expression clear="yes">1-(\d+)</expression>

       </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

       <expression noclean="1"/>   

     </RegExp> 

   </GetEpisodeReverseMappingXMLAPI>

@@ -897,14 +960,29 @@
       <RegExp input="$$5" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="4+">

         
<expression>(?i)&lt;overview&gt;([^&lt;]+)&lt;/overview&gt;</expression>

       </RegExp>

-      <RegExp conditional="SpecialsInside" input="$$14-$$19-$$15-$$16" 
output="&lt;url function=&quot;GetEpisodeReverseMappingXMLAPI&quot; 
cache=&quot;anime-list.xml&quot;&gt;http://sites.google.com/site/anidblist/anime-list.xml&lt;/url&gt;";
 dest="4+">

+      <RegExp conditional="SpecialsInside" input="$$6" output="\1" dest="4+">

         <RegExp input="$$5" output="\1" dest="16">

           <expression 
clear="yes">(?i)&lt;airsbefore_season&gt;(\d+)&lt;/airsbefore_season&gt;</expression>

         </RegExp>

         <RegExp input="$$5" output="\1" dest="15">

           <expression 
clear="yes">(?i)&lt;airsbefore_episode&gt;(\d+)&lt;/airsbefore_episode&gt;</expression>

         </RegExp>

-        <expression>false-0-\d+-\d+</expression>

+        <RegExp input="" output="" dest="6">

+          <expression clear="yes"/>

+        </RegExp>

+        <RegExp conditional="PersonalAnimeMapping" input="$$14-$$19-$$15-$$16" 
output="&lt;url function=&quot;GetPersonalAnimeMapping&quot; 
cache=&quot;pers-anime-list.xml&quot;&gt;$INFO[PersonalAnimeMappingUrl]&lt;/url&gt;"
 dest="6+">

+          <expression>false-0-\d+-\d+</expression>

+        </RegExp>

+        <RegExp input="$$14-$$19-$$15-$$16" output="&lt;url 
function=&quot;GetEpisodeReverseMappingXMLAPI&quot; 
cache=&quot;anime-list.xml&quot;&gt;$INFO[AnimeMappingUrl]&lt;/url&gt;" 
dest="6+">

+          <expression>false-0-\d+-\d+</expression>

+        </RegExp>

+        <expression noclean="1"/>   

+      </RegExp>

+      <RegExp input="" output="" dest="1">

+        <expression clear="yes"/>

+      </RegExp>

+      <RegExp input="" output="" dest="2">

+        <expression clear="yes"/>

       </RegExp>

       <expression noclean="1"/>   

     </RegExp> 

diff --git a/metadata.anidb.net/changelog.txt b/metadata.anidb.net/changelog.txt
index 81af07e..99654fd 100644
--- a/metadata.anidb.net/changelog.txt
+++ b/metadata.anidb.net/changelog.txt
@@ -1,2 +1,11 @@
 1.0.0:

 Initial commit

+

+1.1.0:

+Fixed: Workaround for bug #11377 (causes scraper freezing or wrong parses in 
specific cases)

+Changed: Splitting settings into categories

+Changed: Slightly improved Google search

+Added: Possibility to specify sources (URLs) for anidb.xml and anime-list.xml 
files

+Added: Possibility to select official title (+language) over main title

+Added: Possibility to use personal anime mapping file

+    
\ No newline at end of file
diff --git a/metadata.anidb.net/resources/language/English/strings.xml 
b/metadata.anidb.net/resources/language/English/strings.xml
index 1d32998..3890192 100644
--- a/metadata.anidb.net/resources/language/English/strings.xml
+++ b/metadata.anidb.net/resources/language/English/strings.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
+  <!-- General -->
   <string id="30000">Use Google Search</string>
-  <string id="30001">AniDB ~ Enable prequel lookup</string>
-  <string id="30002">AniDB ~ Alternative prequel link type</string>
-  <string id="30003">AniDB ~ Enable only single Animation studio 
return</string>
-  <string id="30004">AniDB ~ Enable specials mapping at the end of episode 
list</string>
-  <string id="30005">AniDB ~ Enable specials mapping inside of episode 
list</string>
-  <string id="30006">TheTVDB ~ Enable fanart/posters</string>
-  <string id="30007">TheTVDB ~ Enable banners</string>
-  <string id="30008">TheTVDB ~ Continue lookup if no fanart found</string>
-  <string id="30009">TheTVDB ~ Enable extra episode details</string>
+  <string id="30001">Anime list URL</string>
+  <string id="30002">Anime mapping URL</string>
+  <string id="30003">Use personal anime mapping</string>
+  <string id="30004">Personal anime mapping URL</string>
+  <!-- AniDB -->
+  <string id="30100">Use official name instead of main name</string>
+  <string id="30101">Official name language</string>
+  <string id="30102">Enable prequel lookup</string>
+  <string id="30103">Alternative prequel link type</string>
+  <string id="30104">Enable only single Animation studio return</string>
+  <string id="30105">Enable specials mapping at the end of episode 
list</string>
+  <string id="30106">Enable specials mapping inside of episode list</string>
+  <!-- TheTVDB -->
+  <string id="30200">Enable fanart/posters</string>
+  <string id="30201">Enable banners</string>
+  <string id="30202">Continue lookup if no fanart found</string>
+  <string id="30203">Enable extra episode details</string>
 </strings>
-
diff --git a/metadata.anidb.net/resources/settings.xml 
b/metadata.anidb.net/resources/settings.xml
index b68ce46..f1088ff 100644
--- a/metadata.anidb.net/resources/settings.xml
+++ b/metadata.anidb.net/resources/settings.xml
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <setting label="30000" type="bool" id="Google" default="false"/>
-  <setting label="30001" type="bool" id="Prequels" default="true"/>
-  <setting label="30002" type="labelenum" values="Parent Story|Alternative 
Setting|Side Story" id="AlternativePrequelLinkType" default="Parent Story" 
enable="eq(-1,true)"/>
-  <setting label="30003" type="bool" id="SingleStudio" default="true"/>
-  <setting label="30004" type="bool" id="SpecialsAtEnd" default="true"/>
-  <setting label="30005" type="bool" id="SpecialsInside" default="true"/>
-  <setting label="30006" type="bool" id="Fanart" default="true"/>
-  <setting label="30007" type="bool" id="Banners" default="false" 
enable="eq(-1,true)"/>
-  <setting label="30008" type="bool" id="NoFanartContinue" default="true" 
enable="eq(-2,true)"/>
-  <setting label="30009" type="bool" id="ExtraDetails" default="true"/>
+  <category label="General">
+    <setting label="30000" type="bool" id="Google" default="false"/>
+    <setting type="sep"/>
+    <setting label="30001" type="text" id="AnimeListUrl" 
default="http://sites.google.com/site/anidblist/anidb.xml"/>
+    <setting label="30002" type="text" id="AnimeMappingUrl" 
default="http://sites.google.com/site/anidblist/anime-list.xml"/>
+    <setting label="30003" type="bool" id="PersonalAnimeMapping" 
default="false"/>
+    <setting label="30004" type="text" id="PersonalAnimeMappingUrl" 
default="http://localhost/pers-anime-list.xml"; enable="eq(-1,true)"/>
+  </category>
+  <category label="AniDB">
+    <setting label="30100" type="bool" id="OfficalName" default="false"/>
+    <setting label="30101" type="labelenum" 
values="en|de|fr|it|cs|sk|hu|pl|ru|ja|zh" id="OfficalLanguage" default="en" 
enable="eq(-1,true)"/>
+    <setting type="sep"/>
+    <setting label="30102" type="bool" id="Prequels" default="true"/>
+    <setting label="30103" type="labelenum" values="Parent Story|Alternative 
Setting|Side Story" id="AlternativePrequelLinkType" default="Parent Story" 
enable="eq(-1,true)"/>
+    <setting type="sep"/>
+    <setting label="30104" type="bool" id="SingleStudio" default="true"/>
+    <setting label="30105" type="bool" id="SpecialsAtEnd" default="true"/>
+    <setting label="30106" type="bool" id="SpecialsInside" default="true"/>
+  </category>
+  <category label="TheTVDB">
+       <setting label="30200" type="bool" id="Fanart" default="true"/>
+    <setting label="30201" type="bool" id="Banners" default="false" 
enable="eq(-1,true)"/>
+    <setting label="30202" type="bool" id="NoFanartContinue" default="true" 
enable="eq(-2,true)"/>
+    <setting label="30203" type="bool" id="ExtraDetails" default="true"/>
+  </category>
 </settings>

-----------------------------------------------------------------------

Summary of changes:
 metadata.anidb.net/addon.xml                       |    2 +-
 metadata.anidb.net/anidb.xml                       |  178 ++++++++++++++------
 metadata.anidb.net/changelog.txt                   |    9 +
 .../resources/language/English/strings.xml         |   28 ++-
 metadata.anidb.net/resources/settings.xml          |   35 +++-
 5 files changed, 181 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself; 
WebMatrix provides all the features you need to develop and 
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to