The branch, eden has been updated
via 7d1eb7b8c6c3b62bb49903246009609672c9cd8d (commit)
from 3864104391e77243cb7d8a90af6d9aec35d226e9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=7d1eb7b8c6c3b62bb49903246009609672c9cd8d
commit 7d1eb7b8c6c3b62bb49903246009609672c9cd8d
Author: olympia <[email protected]>
Date: Sun Apr 22 19:31:09 2012 +0200
[metadata.anidb.net] updated to v2.0.0
diff --git a/metadata.anidb.net/addon.xml b/metadata.anidb.net/addon.xml
index b7d9804..43394d6 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.3.1"
+ version="2.0.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 30a4b49..23f0f00 100644
--- a/metadata.anidb.net/anidb.xml
+++ b/metadata.anidb.net/anidb.xml
@@ -96,6 +96,9 @@
<RegExp input="" output="<url function="GetDetailsExt"
cache="anime-list.xml">$INFO[AnimeMappingUrl]</url>"
dest="8+">
<expression/>
</RegExp>
+ <RegExp input="$$20" output="<id>$$2</id><plot>### YOU
ARE BANNED FROM ANIDB.NET ###\nWAIT SOME TIME UNTIL YOU ARE
UNBANNED</plot><episodeguide><url gzip="yes"
cache="$$2.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=$$2</url></episodeguide>";
dest="8">
+ <expression>(?i)<error>banned</error></expression>
+ </RegExp>
<RegExp input="" output="" dest="1">
<expression clear="yes"/>
</RegExp>
@@ -129,8 +132,8 @@
<RegExp input="$$1" output="\1" dest="20">
<expression
clear="yes">(?i)<anime\s+id="(\d+)"</expression>
</RegExp>
- <RegExp input="$$20" output="<id>\1</id>" dest="8">
- <expression clear="yes"/>
+ <RegExp input="$INFO[IdFrom]" output="<id>$$20</id>"
dest="8">
+ <expression clear="yes">AniDB\.net</expression>
</RegExp>
<RegExp input="$$2" output="\1" dest="19">
<expression clear="yes"
noclean="1">(?i)(<anime\s+anidbid="$$20".*?</anime>)</expression>
@@ -180,19 +183,7 @@
<RegExp input="$$18" output="\1" dest="16">
<expression noclean="1">(?i)(<year>.*?</year>)</expression>
</RegExp>
- <RegExp input="$$16" output="\1" dest="8+">
- <expression noclean="1"/>
- </RegExp>
- <RegExp input="$$1"
output="<thumb>http://img7.anidb.net/pics/anime/\1</thumb>";
dest="16">
- <expression
clear="yes">(?i)<picture>([^<]+)</picture></expression>
- </RegExp>
- <RegExp input="$$17" output="\1" dest="16+">
- <expression noclean="1"
repeat="yes">(?i)(<thumb>.*?</thumb>)</expression>
- </RegExp>
- <RegExp input="$$18" output="\1" dest="16">
- <expression noclean="1"
repeat="yes">(?i)(<thumb>.*?</thumb>)</expression>
- </RegExp>
- <RegExp input="$$16" output="\1" dest="8+">
+ <RegExp input="$$16" output="\1" dest="8+">
<expression noclean="1"/>
</RegExp>
<RegExp input="$$1" output="<premiered>\1</premiered>"
dest="16">
@@ -204,13 +195,19 @@
<RegExp input="$$16" output="\1" dest="8+">
<expression noclean="1"/>
</RegExp>
- <!-- Permanent rating (not present for unfinished series) has priority
over temporary rating -->
- <RegExp input="$$1" output="\1;\2" dest="6">
- <expression
clear="yes">(?i)<temporary.+?count="(\d+)"[^>]*>([^<]+)</temporary></expression>
- </RegExp>
- <RegExp input="$$1" output="\1;\2" dest="6">
-
<expression>(?i)<permanent.+?count="(\d+)"[^>]*>([^<]+)</permanent></expression>
- </RegExp>
+ <!-- Rating is selected by scraper setting (Average or Weighted) -->
+ <RegExp input="$INFO[RatingType]" output="$$5" dest="6">
+ <RegExp input="$$1" output="\1;\2" dest="5">
+ <expression
clear="yes">(?i)<temporary.+?count="(\d+)"[^>]*>([^<]+)</temporary></expression>
+ </RegExp>
+ <expression>Average</expression>
+ </RegExp>
+ <RegExp input="$INFO[RatingType]" output="$$5" dest="6">
+ <RegExp input="$$1" output="\1;\2" dest="5">
+ <expression
clear="yes">(?i)<permanent.+?count="(\d+)"[^>]*>([^<]+)</permanent></expression>
+ </RegExp>
+ <expression>Weighted</expression>
+ </RegExp>
<RegExp input="$$6" output="<votes>\1</votes>" dest="16">
<expression clear="yes">(\d+);.+</expression>
</RegExp>
@@ -588,22 +585,34 @@
<RegExp input="$$18" output="\1" dest="10">
<expression noclean="1"
repeat="yes">(?i)(<studio>.*?</studio>)</expression>
</RegExp>
+ <RegExp input="$$10" output="\1" dest="10">
+ <RegExp input="$$10" output="'\1" dest="10">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression clear="yes" noclean="1">'(.*)</expression>
+ </RegExp>
<!-- These studios has priority before rest bellow or not-enumerated
ones ($$10) -->
<RegExp input="$$10" output="\1" dest="11">
- <expression clear="yes" noclean="1">(?i)(<studio>(?=A-1
Pictures<|AIC<|Bee Train<|Bones<|Brains
Base<|Gainax<|Gonzo<|J\.C\.Staff<|Kyoto
Animation<|Madhouse<|Manglobe<|Nomad<|Production
I\.G<|Shaft<|Studio Deen<|Studio
Pierrot<|Sunrise<|Xebec<|ZEXCS<)[^<]+</studio>)</expression>
+ <expression clear="yes" noclean="1">(?i)(<studio>(?=A-1
Pictures<|AIC<|Bee Train<|Bones<|Brain's
Base<|Gainax<|Gonzo<|J\.C\.Staff<|Kyoto
Animation<|Madhouse<|Manglobe<|Nomad<|Production
I\.G<|Shaft<|Studio Deen<|Studio
Pierrot<|Sunrise<|Xebec<|ZEXCS<)[^<]+</studio>)</expression>
</RegExp>
<RegExp input="$$10" output="\1" dest="11+">
- <expression noclean="1">(?i)(<studio>(?=A-1
Pictures<|ACGT<|Actas<|AIC A\.S\.T\.A<|AIC Digital<|AIC
Plus\+<|AIC Spirits<|AIC<|Ajia-dou<|Animate Film<|Anime
Friend<|Aquaplus<|Arcturus<|Arms<|Artland<|Artmic<|Ashi
Productions<|Bee Train<|Bones<|Brains Base<|CoMix Wave
Films<|Daume<|David Production<|Diomedea<|Doga Kobo<|E&G
Films<|G&G Entertainment<|G&G Entertainmnt<|Gainax<|GK
Entertainment<|Gonzo<|Group Tac<|Hal Film
Maker<|Imagin<|J\.C\.Staff<|Karaku<|Keyeast<|Kyoto
Animation<|Madhouse<|Manglobe<|Nippon Animation<|Nomad<|OB
Planning<|OLM<|P\.A\. Works<|Production I\.G<|Radix Ace
Entertainment<|Radix<|Satelight<|Seven Arcs<|Shaft<|Studio
4C<|Studio Barcelona<|Studio Comet<|Studio Deen<|Studio
Fantasia<|Studio Ghibli<|Studio Guts<|Studio Hibari<|Studio
Izena<|Studio Pierrot<|Studio Rikka<|Sunrise<|Synergy
Japan<|SynergySP<|Tatsunoko Production<|Tezuka Productions<|TMS
Entertainment<|Toei Animation<|Toei Douga<|Tokyo Movie<|Trans
Arts<|Triangle Staff<|Ufotable<|White Fox<|Xebec
M2<|Xebec<|Yumeta Company<|Zero G
Room<|ZEXCS<)[^<]+</studio>)</expression>
+ <expression noclean="1">(?i)(<studio>(?=A-1
Pictures<|ACGT<|Actas<|AIC A\.S\.T\.A<|AIC Digital<|AIC
Plus\+<|AIC Spirits<|AIC<|Ajia-dou<|Animate Film<|Anime
Friend<|Aquaplus<|Arcturus<|Arms<|Artland<|Artmic<|Ashi
Productions<|Bee Train<|Bones<|Brain's Base<|CoMix Wave
Films<|Daume<|David Production<|Diomedea<|Doga Kobo<|E&G
Films<|G&G Entertainment<|G&G Entertainmnt<|Gainax<|GK
Entertainment<|Gonzo<|Group Tac<|Hal Film
Maker<|Imagin<|J\.C\.Staff<|Karaku<|Keyeast<|Kyoto
Animation<|Madhouse<|Manglobe<|Nippon Animation<|Nomad<|OB
Planning<|OLM<|Ordet<|P\.A\. Works<|Production I\.G<|Radix Ace
Entertainment<|Radix<|Satelight<|Seven Arcs<|Shaft<|Studio
4C<|Studio Barcelona<|Studio Comet<|Studio Deen<|Studio
Fantasia<|Studio Ghibli<|Studio Guts<|Studio Hibari<|Studio
Izena<|Studio Pierrot<|Studio Rikka<|Sunrise<|Synergy
Japan<|SynergySP<|Tatsunoko Production<|Tezuka Productions<|TMS
Entertainment<|Toei Animation<|Toei Douga<|Tokyo Movie<|Trans
Arts<|Triangle Staff<|Ufotable<|White Fox<|Xebec
M2<|Xebec<|Yumeta Company<|Zero G
Room<|ZEXCS<)[^<]+</studio>)</expression>
</RegExp>
<!-- Same as above only for "Work" studios -->
<RegExp input="$$6" output="<studio>\1</studio>" dest="12">
<expression clear="yes"
repeat="yes">(?i)<name.*?type="Work">([^<]+)</name></expression>
</RegExp>
+ <RegExp input="$$12" output="\1" dest="12">
+ <RegExp input="$$12" output="'\1" dest="12">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression clear="yes" noclean="1">'(.*)</expression>
+ </RegExp>
<RegExp input="$$12" output="\1" dest="13">
- <expression clear="yes" noclean="1">(?i)(<studio>(?=A-1
Pictures<|AIC<|Bee Train<|Bones<|Brains
Base<|Gainax<|Gonzo<|J\.C\.Staff<|Kyoto
Animation<|Madhouse<|Manglobe<|Nomad<|Production
I\.G<|Shaft<|Studio Deen<|Studio
Pierrot<|Sunrise<|Xebec<|ZEXCS<)[^<]+</studio>)</expression>
+ <expression clear="yes" noclean="1">(?i)(<studio>(?=A-1
Pictures<|AIC<|Bee Train<|Bones<|Brain's
Base<|Gainax<|Gonzo<|J\.C\.Staff<|Kyoto
Animation<|Madhouse<|Manglobe<|Nomad<|Production
I\.G<|Shaft<|Studio Deen<|Studio
Pierrot<|Sunrise<|Xebec<|ZEXCS<)[^<]+</studio>)</expression>
</RegExp>
<RegExp input="$$12" output="\1" dest="13+">
- <expression noclean="1">(?i)(<studio>(?=A-1
Pictures<|ACGT<|Actas<|AIC A\.S\.T\.A<|AIC Digital<|AIC
Plus\+<|AIC Spirits<|AIC<|Ajia-dou<|Animate Film<|Anime
Friend<|Aquaplus<|Arcturus<|Arms<|Artland<|Artmic<|Ashi
Productions<|Bee Train<|Bones<|Brains Base<|CoMix Wave
Films<|Daume<|David Production<|Diomedea<|Doga Kobo<|E&G
Films<|G&G Entertainment<|G&G Entertainmnt<|Gainax<|GK
Entertainment<|Gonzo<|Group Tac<|Hal Film
Maker<|Imagin<|J\.C\.Staff<|Karaku<|Keyeast<|Kyoto
Animation<|Madhouse<|Manglobe<|Nippon Animation<|Nomad<|OB
Planning<|OLM<|P\.A\. Works<|Production I\.G<|Radix Ace
Entertainment<|Radix<|Satelight<|Seven Arcs<|Shaft<|Studio
4C<|Studio Barcelona<|Studio Comet<|Studio Deen<|Studio
Fantasia<|Studio Ghibli<|Studio Guts<|Studio Hibari<|Studio
Izena<|Studio Pierrot<|Studio Rikka<|Sunrise<|Synergy
Japan<|SynergySP<|Tatsunoko Production<|Tezuka Productions<|TMS
Entertainment<|Toei Animation<|Toei Douga<|Tokyo Movie<|Trans
Arts<|Triangle Staff<|Ufotable<|White Fox<|Xebec
M2<|Xebec<|Yumeta Company<|Zero G
Room<|ZEXCS<)[^<]+</studio>)</expression>
+ <expression noclean="1">(?i)(<studio>(?=A-1
Pictures<|ACGT<|Actas<|AIC A\.S\.T\.A<|AIC Digital<|AIC
Plus\+<|AIC Spirits<|AIC<|Ajia-dou<|Animate Film<|Anime
Friend<|Aquaplus<|Arcturus<|Arms<|Artland<|Artmic<|Ashi
Productions<|Bee Train<|Bones<|Brain's Base<|CoMix Wave
Films<|Daume<|David Production<|Diomedea<|Doga Kobo<|E&G
Films<|G&G Entertainment<|G&G Entertainmnt<|Gainax<|GK
Entertainment<|Gonzo<|Group Tac<|Hal Film
Maker<|Imagin<|J\.C\.Staff<|Karaku<|Keyeast<|Kyoto
Animation<|Madhouse<|Manglobe<|Nippon Animation<|Nomad<|OB
Planning<|OLM<|Ordet<|P\.A\. Works<|Production I\.G<|Radix Ace
Entertainment<|Radix<|Satelight<|Seven Arcs<|Shaft<|Studio
4C<|Studio Barcelona<|Studio Comet<|Studio Deen<|Studio
Fantasia<|Studio Ghibli<|Studio Guts<|Studio Hibari<|Studio
Izena<|Studio Pierrot<|Studio Rikka<|Sunrise<|Synergy
Japan<|SynergySP<|Tatsunoko Production<|Tezuka Productions<|TMS
Entertainment<|Toei Animation<|Toei Douga<|Tokyo Movie<|Trans
Arts<|Triangle Staff<|Ufotable<|White Fox<|Xebec
M2<|Xebec<|Yumeta Company<|Zero G
Room<|ZEXCS<)[^<]+</studio>)</expression>
</RegExp>
<!-- Only first studio is overtaken, order is result of joint
$$11$$10$$13$$12 -->
<expression noclean="1">(<studio>.+?</studio>)</expression>
@@ -625,7 +634,25 @@
</RegExp>
<expression noclean="1"/>
</RegExp>
- <RegExp input="$$18" output="\1" dest="8+">
+ <RegExp input="" output="" dest="14">
+ <expression clear="yes"/>
+ </RegExp>
+ <RegExp input="" output="" dest="15">
+ <expression clear="yes"/>
+ </RegExp>
+ <RegExp conditional="Posters" input="$$1"
output="<thumb>http://img7.anidb.net/pics/anime/\1</thumb>";
dest="15">
+ <expression>(?i)<picture>([^<]+)</picture></expression>
+ </RegExp>
+ <RegExp conditional="Posters" input="$$17" output="\1" dest="15+">
+ <expression noclean="1"
repeat="yes">(?i)(<thumb>.*?</thumb>)</expression>
+ </RegExp>
+ <RegExp conditional="Posters" input="$$18" output="\1" dest="15">
+ <expression noclean="1"
repeat="yes">(?i)(<thumb>.*?</thumb>)</expression>
+ </RegExp>
+ <RegExp input="" output="" dest="16">
+ <expression clear="yes"/>
+ </RegExp>
+ <RegExp conditional="Fanarts" input="$$18" output="\1" dest="16">
<expression noclean="1">(?i)(<fanart.*?</fanart>)</expression>
</RegExp>
<RegExp input="$$20" output="<episodeguide><url
gzip="yes"
cache="$$20.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=$$20</url></episodeguide>";
dest="8+">
@@ -634,17 +661,14 @@
<RegExp input="$$20" output="<url
function="GetTVDBLookupAPI"
cache="$$20.xml">&</url>" dest="6">
<expression clear="yes"/>
</RegExp>
+ <RegExp input="$$19" output="\1" dest="19">
+ <expression
clear="yes">(?i)tvdbid="([^"]*)"</expression>
+ </RegExp>
<RegExp input="$$19" output="<url
function="GetFanartDataAPI"
cache="tvdb-$$20.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/en.zip</url>";
dest="6">
- <RegExp input="$$19" output="\1" dest="19">
- <expression
clear="yes">(?i)tvdbid="([^"]*)"</expression>
- </RegExp>
<expression>(\d+)</expression>
</RegExp>
- <RegExp conditional="!Fanart" input="" output="\1" dest="6">
- <expression clear="yes"/>
- </RegExp>
- <RegExp input="~$$19~" output="$$6" dest="6">
- <expression clear="yes">(?:~~|~\d+~)</expression>
+ <RegExp input="$$19" output="<url
function="GetFanartDataReturnAPI"
cache="$$20.xml">&</url>" dest="6">
+ <expression>[^\d]+</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="8+">
<expression noclean="1"/>
@@ -652,13 +676,7 @@
<RegExp input="" output="" dest="1">
<expression clear="yes"/>
</RegExp>
- <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">
+ <RegExp input="true" output="\1" dest="13">
<expression clear="yes"/>
</RegExp>
<expression noclean="1"/>
@@ -673,7 +691,8 @@
$$17 ... AniDB prequel id
$$16 ... List of fanarts
$$15 ... List of thumbs
- $$14 ... Direct call to GetFanartDataAPI (true/false)
+ $$14 ... List of banners
+ $$13 ... Direct call to GetFanartDataAPI (true/false)
-->
<GetTVDBLookupAPI clearbuffers="no" dest="4">
@@ -744,7 +763,7 @@
<RegExp input="$$10" output="\1" dest="18+">
<expression noclean="1"/>
</RegExp>
- <RegExp input="false" output="\1" dest="14">
+ <RegExp input="false" output="\1" dest="13">
<expression clear="yes"/>
</RegExp>
<RegExp conditional="Prequels" input="$$10" output="\1" dest="17">
@@ -797,6 +816,7 @@
</GetTVDBLookupLoopAPI>
<GetFanartAPI clearbuffers="no" dest="4">
+ <!--RegExp input="$$4" output="<details>\1</details>
@@@### $$5 ###@@@" dest="4"-->
<RegExp input="$$4" output="<details>\1</details>" dest="4">
<RegExp input="$$20" output="<url
function="GetTVDBLookupLoopAPI"
cache="\1.xml">&</url>" dest="4">
<expression clear="yes"/>
@@ -804,6 +824,12 @@
<RegExp input="$$1" output="<url
function="GetFanartDataAPI"
cache="tvdb-$$20.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/en.zip</url>";
dest="4">
<expression>(?i)<seriesid>(\d+)</seriesid></expression>
</RegExp>
+ <RegExp input="$$1" output="<anime anidbid="$$20"
tvdbid="\1"
defaulttvdbseason="1"><name>$$20</name></anime>"
dest="5">
+ <expression
clear="yes">(?i)<seriesid>(\d+)</seriesid></expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="19">
+ <expression>(?i)<seriesid>(\d+)</seriesid></expression>
+ </RegExp>
<RegExp input="" output="" dest="1">
<expression clear="yes"/>
</RegExp>
@@ -812,7 +838,19 @@
</GetFanartAPI>
<GetFanartDataReturnAPI clearbuffers="no" dest="4">
- <RegExp input="$$16$$15" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$6$$5$$16" output="<details>\1</details>"
dest="4">
+ <RegExp input="$INFO[IdFrom]-$$19" output="<id>\1</id>"
dest="6">
+ <expression clear="yes">TheTVDB\.com-(\d+)</expression>
+ </RegExp>
+ <RegExp input="" output="$$15$$14" dest="5">
+ <expression clear="yes"/>
+ </RegExp>
+ <RegExp input="$INFO[PostersOrder]" output="$$15$$14" dest="5">
+ <expression>Posters first</expression>
+ </RegExp>
+ <RegExp input="$INFO[PostersOrder]" output="$$14$$15" dest="5">
+ <expression>Banners first</expression>
+ </RegExp>
<RegExp input="" output="" dest="1">
<expression clear="yes"/>
</RegExp>
@@ -825,40 +863,37 @@
<RegExp input="$$1" output="\1" dest="5">
<expression clear="yes"
noclean="1">(?i)<Banners>(.*?)</Banners></expression>
</RegExp>
- <RegExp input="$$6" output="<fanart
url="http://thetvdb.com/banners/">\1</fanart>"; dest="16">
+ <RegExp conditional="Fanarts" input="$$6" output="<fanart
url="http://thetvdb.com/banners/">\1</fanart>"; dest="16+">
<RegExp input="$$5" output="<thumb dim="\2"
colors="\3" preview="_cache/\1">\1</thumb>"
dest="6">
<expression clear="yes"
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>fanart</BannerType>[^<]*<BannerType2>([^<]*)</BannerType2>[^<]*<Colors>([^<]*)</Colors></expression>
</RegExp>
- <expression clear="yes" noclean="1">(.+)</expression>
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7">
- <expression clear="yes"
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression>
+ <RegExp conditional="Posters" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="15+">
+ <expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7+">
+ <RegExp conditional="Posters" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="15+">
<expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>season</BannerType2></expression>
</RegExp>
- <RegExp conditional="Banners" input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7+">
+ <RegExp conditional="Banners" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="14+">
<expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2></expression>
</RegExp>
- <RegExp conditional="Banners" input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7+">
+ <RegExp conditional="Banners" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="14+">
<expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2</expression>
</RegExp>
- <RegExp conditional="Banners" input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7+">
+ <RegExp conditional="Banners" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="14+">
<expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>text</BannerType2</expression>
</RegExp>
- <RegExp conditional="Banners" input="$$1"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="7+">
+ <RegExp conditional="Banners" input="$$5"
output="<thumb>http://thetvdb.com/banners/\1</thumb>"; dest="14+">
<expression
repeat="yes">(?i)<BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>blank</BannerType2</expression>
</RegExp>
- <RegExp input="$$7" output="\1" dest="15">
- <expression noclean="1">(.+)</expression>
- </RegExp>
- <RegExp input="" output="\1" dest="4">
+ <RegExp input="" output="" dest="4">
<expression clear="yes"/>
</RegExp>
<RegExp conditional="NoFanartContinue" input="$$16" output="<url
function="GetTVDBLookupLoopAPI"
cache="$$20.xml">&</url>" dest="4">
<expression/>
</RegExp>
- <RegExp input="$$14" output="<url
function="GetFanartDataReturnAPI"
cache="$$20.xml">&</url>" dest="4">
+ <RegExp input="$$13" output="<url
function="GetFanartDataReturnAPI"
cache="$$20.xml">&</url>" dest="4">
<expression>true</expression>
</RegExp>
<RegExp conditional="NoFanartContinue" input="$$16" output="<url
function="GetFanartDataReturnAPI"
cache="$$20.xml">&</url>" dest="4">
@@ -903,9 +938,12 @@
<RegExp input="$$1" output="\1" dest="5">
<expression clear="yes" noclean="1">(?i)(<episode
id="$$3".*?</episode>)</expression>
</RegExp>
- <RegExp input="$$7" output="<title>\1</title>" dest="4">
+ <RegExp input="$$3" output="<code>\1</code>" dest="4">
+ <expression clear="yes"/>
+ </RegExp>
+ <RegExp input="$$7" output="<title>\1</title>" dest="4+">
<RegExp input="$$5" output="\1" dest="6">
- <expression clear="yes">(?i)<title
xml:lang="en"[^>]*>([^<]+)</title></expression>
+ <expression clear="yes">(?i)<title
xml:lang="en"[^>]*>([^<]+)</title></expression>
</RegExp>
<RegExp input="$$6" output="'\1" dest="7">
<expression clear="yes" repeat="yes">`?([^`]+)</expression>
diff --git a/metadata.anidb.net/changelog.txt b/metadata.anidb.net/changelog.txt
index c2488cd..497e3f1 100644
--- a/metadata.anidb.net/changelog.txt
+++ b/metadata.anidb.net/changelog.txt
@@ -1,11 +1,23 @@
+2.0.0:
+Added: Option to choose scraped rating (Average or Weighted)
+Added: Option to choose order of posters and banners (Posters first or Banner
first)
+Added: Option to choose scraper anime id (from AniDB.net or from TheTVDB.com)
+Added: Catching Banned error message from AniDB.net, scraper will output clear
warning message instead of anime plot
+Changed: Slightly improved studios name filtering
+
+#WARNING: There was some internal INCOMPATIBLE changes to scraper setting.
Please check your scraper/source settings if everything is correctly set
+
+1.3.2:
+Added: Store AniDB.net EpisodeId in database
+
1.3.1:
-Fixed: Corrected problem with no episodes scarped for Animes without cast
+Fixed: Corrected problem with no episodes scraped for anime without cast
1.3.0:
Added: Actors thumbnail
-Added: Store AniDB.net ID in database (maybe it'll be useful in future ;))
+Added: Store AniDB.net AnimeId in database
Fixed: Episodes list correction (unexpected change in xml returned from
AniDB.net)
-Changed: 1->2 episode mapping correction
+Fixed: 1->2 episode mapping correction
Changed: Small plot filtering improvement
1.2.0:
@@ -17,9 +29,9 @@ Added: Loading characters + actors/seiyus
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
+Added: Option to specify sources (URLs) for anidb.xml and anime-list.xml files
+Added: Option to select official title (+language) over main title
+Added: Option to use personal anime mapping file
1.0.0:
Initial commit
diff --git a/metadata.anidb.net/resources/language/English/strings.xml
b/metadata.anidb.net/resources/language/English/strings.xml
index a1e011a..9d73927 100644
--- a/metadata.anidb.net/resources/language/English/strings.xml
+++ b/metadata.anidb.net/resources/language/English/strings.xml
@@ -6,6 +6,7 @@
<string id="30002">Anime mapping URL</string>
<string id="30003">Use personal anime mapping</string>
<string id="30004">Personal anime mapping URL</string>
+ <string id="30005">Store anime ID from</string>
<!-- AniDB -->
<string id="30100">Use official name instead of main name</string>
<string id="30101">Official name language</string>
@@ -17,9 +18,12 @@
<string id="30107">Return only Main characters cast</string>
<string id="30108">Return only Genres with weight</string>
<string id="30109">Number of Genres returned</string>
+ <string id="30110">Use rating</string>
<!-- TheTVDB -->
- <string id="30200">Enable fanart/posters</string>
+ <string id="30200">Enable fanarts</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>
+ <string id="30204">Enable posters</string>
+ <string id="30205">Posters/Banners order</string>
</strings>
diff --git a/metadata.anidb.net/resources/settings.xml
b/metadata.anidb.net/resources/settings.xml
index c42f17b..cbb619a 100644
--- a/metadata.anidb.net/resources/settings.xml
+++ b/metadata.anidb.net/resources/settings.xml
@@ -2,6 +2,7 @@
<settings>
<category label="General">
<setting label="30000" type="bool" id="Google" default="false"/>
+ <setting label="30005" type="labelenum" id="IdFrom"
values="AniDB.net|TheTVDB.com" default="AniDB.net"/>
<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"/>
@@ -10,22 +11,27 @@
</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 label="30101" type="labelenum" id="OfficalLanguage"
values="en|de|fr|it|cs|sk|hu|pl|ru|ja|zh" default="en" enable="eq(-1,true)"/>
+ <setting label="30110" type="labelenum" id="RatingType"
values="Average|Weighted" default="Average"/>
<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 label="30103" type="labelenum" id="AlternativePrequelLinkType"
values="Parent Story|Alternative Setting|Side Story" default="Parent Story"
enable="eq(-1,true)"/>
<setting type="sep"/>
- <setting label="30108" type="labelenum"
values="600|600+500|600+500+400|600+500+400+300|600+500+400+300+200|600+500+400+300+200+100"
id="GenreWeight" default="600+500"/>
- <setting label="30109" type="labelenum" values="9|8|7|6|5|4|3|2|1|0"
id="GenreCount" default="6"/>
+ <setting label="30108" type="labelenum" id="GenreWeight"
values="600|600+500|600+500+400|600+500+400+300|600+500+400+300+200|600+500+400+300+200+100"
default="600+500"/>
+ <setting label="30109" type="labelenum" id="GenreCount"
values="9|8|7|6|5|4|3|2|1|0" default="6"/>
<setting label="30104" type="bool" id="SingleStudio" default="true"/>
<setting label="30107" type="bool" id="OnlyMainCast" default="false"/>
<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="30204" type="bool" id="Posters" default="true"/>
+ <setting label="30201" type="bool" id="Banners" default="false"/>
+ <setting label="30205" type="labelenum" id="PostersOrder" values="Posters
first|Banners first" default="Posters first" enable="eq(-1,true)+eq(-2,true)"/>
+ <setting type="sep"/>
+ <setting label="30200" type="bool" id="Fanarts" default="true"/>
+ <setting label="30202" type="bool" id="NoFanartContinue" default="true"
enable="eq(-1,true)"/>
+ <setting type="sep"/>
<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 | 160 ++++++++++++--------
metadata.anidb.net/changelog.txt | 24 +++-
.../resources/language/English/strings.xml | 6 +-
metadata.anidb.net/resources/settings.xml | 20 ++-
5 files changed, 136 insertions(+), 76 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
