The branch, dharma has been updated
via 3453ee4fdfdcb874e73f69aa53e0aaa743fc00a7 (commit)
from 28378ef0028af365846d040be0025873d3642ae9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=3453ee4fdfdcb874e73f69aa53e0aaa743fc00a7
commit 3453ee4fdfdcb874e73f69aa53e0aaa743fc00a7
Author: olympia <[email protected]>
Date: Tue Apr 19 14:53:14 2011 +0200
[metadata.anidb.net] updated to version 1.2.0
diff --git a/metadata.anidb.net/addon.xml b/metadata.anidb.net/addon.xml
index 8d6cf12..efbaa23 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.1.0"
+ version="1.2.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 d26e183..59b1271 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="2011-04-02">
+<scraper framework="1.1" date="2011-04-18">
<NfoUrl dest="3">
<RegExp input="$$1" output="<url gzip="yes"
cache="\1.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=\1</url>";
dest="3">
@@ -138,18 +138,24 @@
<RegExp input="$$19" output="\1" dest="17">
<expression clear="yes"
noclean="1">(?i)(<supplemental-info(?!\s+replace="(?:true|yes)")[^>]*>.*?</supplemental-info>)</expression>
</RegExp>
- <RegExp conditional="OfficalName" input="$$1" output="\1" dest="15">
- <expression clear="yes"
trim="1">(?i)<title\s+xml:lang="$INFO[OfficalLanguage]"\s+type="official">([^<]+)</title></expression>
- </RegExp>
- <RegExp input="$$1" output="<title>\1</title>" dest="8">
+ <RegExp input="$$1" output="<title>\1</title>" dest="16">
<expression clear="yes"
trim="1">(?i)<title.*?type="main">([^<]+)</title></expression>
</RegExp>
- <RegExp conditional="OfficalName" input="$$15"
output="<title>\1</title>" dest="8">
+ <RegExp conditional="OfficalName" input="$$1" output="\1" dest="15">
+ <expression clear="yes"
trim="1">(?i)<title\s+xml:lang="$INFO[OfficalLanguage]"\s+type="official">([^<]+)</title></expression>
+ </RegExp>
+ <RegExp conditional="OfficalName" input="$$15"
output="<title>\1</title>" dest="16">
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$18" output="\1" dest="8">
+ <RegExp input="$$18" output="\1" dest="16">
<expression
noclean="1">(?i)(<title>.*?</title>)</expression>
</RegExp>
+ <RegExp input="$$16" output="\1" dest="8">
+ <RegExp input="$$16" output="'\1" dest="16">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression clear="yes" noclean="1">'(.*)</expression>
+ </RegExp>
<RegExp conditional="!OfficalName" input="$$1"
output="<originaltitle>\1</originaltitle>" dest="16">
<expression clear="yes"
trim="1">(?i)<title\s+xml:lang="en"\s+type="official">([^<]+)</title></expression>
</RegExp>
@@ -160,7 +166,10 @@
<expression
noclean="1">(?i)(<originaltitle>.*?</originaltitle>)</expression>
</RegExp>
<RegExp input="$$16" output="\1" dest="8+">
- <expression noclean="1"/>
+ <RegExp input="$$16" output="'\1" dest="16">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression noclean="1">'(.*)</expression>
</RegExp>
<RegExp input="$$1" output="<year>\1</year>" dest="16">
<expression clear="yes">(?i)<startdate>(\d{4})-</expression>
@@ -168,7 +177,7 @@
<RegExp input="$$18" output="\1" dest="16">
<expression noclean="1">(?i)(<year>.*?</year>)</expression>
</RegExp>
- <RegExp input="$$16" output="\1" dest="8+">
+ <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">
@@ -217,12 +226,45 @@
<RegExp input="$$16" output="\1" dest="8+">
<expression noclean="1"/>
</RegExp>
- <!-- Only genres with weight 600 and 500 are overtaken -->
- <RegExp input="$$1" output="<genre>\1</genre>" dest="6">
+ <!-- Only genres with defined weight are overtaken -->
+ <RegExp input="$$1" output="\1" dest="5">
+ <expression clear="yes"
noclean="1">(?i)<categories>(.*?)</categories></expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
<expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="600">[^<]*<name>([^<]+)</name></expression>
</RegExp>
- <RegExp input="$$1" output="<genre>\1</genre>" dest="6+">
- <expression
repeat="yes">(?i)<category[^>]*weight="500">[^<]*<name>([^<]+)</name></expression>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6">
+ <expression clear="yes" noclean="1">(?i)[^-]*600[^-]*-(.*)</expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="500">[^<]*<name>([^<]+)</name></expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6+">
+ <expression noclean="1">(?i)[^-]*500[^-]*-(.*)</expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="400">[^<]*<name>([^<]+)</name></expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6+">
+ <expression noclean="1">(?i)[^-]*400[^-]*-(.*)</expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="300">[^<]*<name>([^<]+)</name></expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6+">
+ <expression noclean="1">(?i)[^-]*300[^-]*-(.*)</expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="200">[^<]*<name>([^<]+)</name></expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6+">
+ <expression noclean="1">(?i)[^-]*200[^-]*-(.*)</expression>
+ </RegExp>
+ <RegExp input="$$5" output="<genre>\1</genre>" dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<category[^>]*weight="100">[^<]*<name>([^<]+)</name></expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreWeight]-$$7" output="\1" dest="6+">
+ <expression noclean="1">(?i)[^-]*100[^-]*-(.*)</expression>
</RegExp>
<RegExp input="$$17" output="\1" dest="6+">
<expression noclean="1"
repeat="yes">(?i)(<genre>.*?</genre>)</expression>
@@ -332,9 +374,33 @@
<RegExp input="$$18" output="\1" dest="6">
<expression noclean="1"
repeat="yes">(?i)(<genre>.*?</genre>)</expression>
</RegExp>
- <!-- Only 6 genres is overtaken -->
- <RegExp input="$$6" output="\1\2\3\4\5\6" dest="8+">
- <expression
noclean="1,2,3,4,5,6">(?i)(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ <!-- Only specified number genres is overtaken -->
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4\5\6\7\8\9"
dest="8+">
+ <expression
noclean="1,2,3,4,5,6,7,8,9">(?i)9-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4\5\6\7\8"
dest="8+">
+ <expression
noclean="1,2,3,4,5,6,7,8">(?i)8-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4\5\6\7" dest="8+">
+ <expression
noclean="1,2,3,4,5,6,7">(?i)7-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4\5\6" dest="8+">
+ <expression
noclean="1,2,3,4,5,6">(?i)6-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4\5" dest="8+">
+ <expression
noclean="1,2,3,4,5">(?i)5-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3\4" dest="8+">
+ <expression
noclean="1,2,3,4">(?i)4-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2\3" dest="8+">
+ <expression
noclean="1,2,3">(?i)3-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1\2" dest="8+">
+ <expression
noclean="1,2">(?i)2-(<genre>[^<]+</genre>)(<genre>[^<]+</genre>)?</expression>
+ </RegExp>
+ <RegExp input="$INFO[GenreCount]-$$6" output="\1" dest="8+">
+ <expression
noclean="1">(?i)1-(<genre>[^<]+</genre>)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
<expression
clear="yes"><description[^>]*>(.*?)</description></expression>
@@ -432,7 +498,13 @@
</RegExp>
<RegExp input="$$6" output="\1" dest="6">
<expression noclean="1">(?:\r?\n)*(.*)</expression>
- </RegExp>
+ </RegExp>
+ <RegExp input="$$6" output="'\1" dest="6">
+ <expression repeat="yes" noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <RegExp input="$$6" output="\1" dest="6">
+ <expression noclean="1">'(.*)</expression>
+ </RegExp>
<RegExp input="$$6" output="<plot>\1</plot>" dest="16">
<expression clear="yes" noclean="1" trim="1"/>
</RegExp>
@@ -442,10 +514,32 @@
<RegExp input="$$16" output="\1" dest="8+">
<expression noclean="1"/>
</RegExp>
+ <!-- Main character + optionaly Secondary character enumared as "Cast"
-->
<RegExp input="$$1" output="\1" dest="6">
- <expression clear="yes"
noclean="1">(?i)<creators>(.*)</creators></expression>
+ <expression clear="yes"
noclean="1">(?i)<characters>(.*?)</characters></expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<actor><name>\2</name><role>\1</role></actor>"
dest="16">
+ <expression clear="yes"
repeat="yes">(?i)<character.*?type="main character
in"[^>]*>.*?<name>([^<]*)</name>.*?<seiyuu[^>]*>([^<]*)</seiyuu>.*?</character></expression>
+ </RegExp>
+ <RegExp conditional="!OnlyMainCast" input="$$6"
output="<actor><name>\2</name><role>\1</role></actor>"
dest="16+">
+ <expression repeat="yes">(?i)<character.*?type="secondary cast
in"[^>]*>.*?<name>([^<]*)</name>.*?<seiyuu[^>]*>([^<]*)</seiyuu>.*?</character></expression>
+ </RegExp>
+ <RegExp input="$$17" output="\1" dest="16+">
+ <expression noclean="1"
repeat="yes">(?i)(<actor>.*?</actor>)</expression>
+ </RegExp>
+ <RegExp input="$$18" output="\1" dest="16">
+ <expression noclean="1"
repeat="yes">(?i)(<actor>.*?</actor>)</expression>
+ </RegExp>
+ <RegExp input="$$16" output="\1" dest="8+">
+ <RegExp input="$$16" output="'\1" dest="16">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression noclean="1">'(.*)</expression>
</RegExp>
<!-- All "Original" and "Character" creators are enumerated as "Writter"
-->
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression clear="yes"
noclean="1">(?i)<creators>(.*?)</creators></expression>
+ </RegExp>
<RegExp input="$$6" output="<credits>\1</credits>" dest="16">
<expression clear="yes"
repeat="yes">(?i)<name.*?type="(?:Original|Character)[^>]*?>(.*?)</name></expression>
</RegExp>
@@ -456,7 +550,10 @@
<expression noclean="1"
repeat="yes">(?i)(<credits>.*?</credits>)</expression>
</RegExp>
<RegExp input="$$16" output="\1" dest="8+">
- <expression noclean="1"/>
+ <RegExp input="$$16" output="'\1" dest="16">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression noclean="1">'(.*)</expression>
</RegExp>
<!-- All "Direction" creators are enumerated as "Director" -->
<RegExp input="$$6" output="<director>\1</director>"
dest="16">
@@ -469,7 +566,10 @@
<expression noclean="1"
repeat="yes">(?i)(<director>.*?</director>)</expression>
</RegExp>
<RegExp input="$$16" output="\1" dest="8+">
- <expression noclean="1"/>
+ <RegExp input="$$16" output="'\1" dest="16">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression noclean="1">'(.*)</expression>
</RegExp>
<RegExp conditional="SingleStudio" input="$$11$$10$$13$$12" output="\1"
dest="8+">
<!-- "Animation work" studios has priority over "Work" studios bellow
($$13,$$12) -->
@@ -788,8 +888,14 @@
<RegExp input="$$1" output="\1" dest="5">
<expression clear="yes" noclean="1">(?i)(<episode
id="$$3".*?</episode>)</expression>
</RegExp>
- <RegExp input="$$5" output="<title>\1</title>" dest="4">
- <expression clear="yes">(?i)<title
xml:lang="en"[^>]*>([^<]+)</title></expression>
+ <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>
+ </RegExp>
+ <RegExp input="$$6" output="'\1" dest="7">
+ <expression clear="yes" repeat="yes">`?([^`]+)</expression>
+ </RegExp>
+ <expression>'(.*)</expression>
</RegExp>
<RegExp input="$$5" output="1-\1" dest="9">
<expression
clear="yes">(?i)<epno[^>]*>(\d+)</epno></expression>
@@ -822,6 +928,21 @@
<expression>(?i)<airdate[^>]*>([^<]+)</airdate></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
+ <expression clear="yes"
noclean="1">(?i)<characters>(.*?)</characters></expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<actor><name>\5</name><role>\2</role></actor>"
dest="7">
+ <expression clear="yes"
repeat="yes">(?i)<character[^>]*type="main character
in"[^>]*>\s*(?:<([^>\s]+)[^>]*>[^<]*</\1>\s*)*?<name>([^<]*)</name>\s*(?:<([^>\s]+)[^>]*>[^<]*</\3>\s*)*?<episodes[^<]*[>,]$$3[<,][^/]*/episodes>\s*(?:<([^>\s]+)[^>]*>[^<]*</\4>\s*)*?<seiyuu[^>]*>([^<]*)</seiyuu>\s*(?:<([^>\s]+)[^>]*>[^<]*</\6>\s*)*?</character></expression>
+ </RegExp>
+ <RegExp conditional="!OnlyMainCast" input="$$6"
output="<actor><name>\5</name><role>\2</role></actor>"
dest="7+">
+ <expression repeat="yes">(?i)<character[^>]*type="secondary
cast
in"[^>]*>\s*(?:<([^>\s]+)[^>]*>[^<]*</\1>\s*)*?<name>([^<]*)</name>\s*(?:<([^>\s]+)[^>]*>[^<]*</\3>\s*)*?<episodes[^<]*[>,]$$3[<,][^/]*/episodes>\s*(?:<([^>\s]+)[^>]*>[^<]*</\4>\s*)*?<seiyuu[^>]*>([^<]*)</seiyuu>\s*(?:<([^>\s]+)[^>]*>[^<]*</\6>\s*)*?</character></expression>
+ </RegExp>
+ <RegExp input="$$7" output="\1" dest="4+">
+ <RegExp input="$$7" output="'\1" dest="7">
+ <expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
+ </RegExp>
+ <expression noclean="1">'(.*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="6">
<expression clear="yes"
noclean="1">(?i)<creators>(.*?)</creators></expression>
</RegExp>
<RegExp input="$$6" output="<credits>\1</credits>" dest="4+">
diff --git a/metadata.anidb.net/changelog.txt b/metadata.anidb.net/changelog.txt
index 99654fd..a690bbb 100644
--- a/metadata.anidb.net/changelog.txt
+++ b/metadata.anidb.net/changelog.txt
@@ -8,4 +8,8 @@ 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
+
+1.2.0:
+Changed: Replace "`" with "'" in all significant texts
+Changed: Configuration for genres
+Added: Loading characters + actors/seiyus
\ 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 3890192..a1e011a 100644
--- a/metadata.anidb.net/resources/language/English/strings.xml
+++ b/metadata.anidb.net/resources/language/English/strings.xml
@@ -11,9 +11,12 @@
<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>
+ <string id="30104">Return only single Animation studio</string>
+ <string id="30105">Map specials at the end of episode list</string>
+ <string id="30106">Map specials inside of episode list</string>
+ <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>
<!-- TheTVDB -->
<string id="30200">Enable fanart/posters</string>
<string id="30201">Enable banners</string>
diff --git a/metadata.anidb.net/resources/settings.xml
b/metadata.anidb.net/resources/settings.xml
index f1088ff..c42f17b 100644
--- a/metadata.anidb.net/resources/settings.xml
+++ b/metadata.anidb.net/resources/settings.xml
@@ -15,7 +15,10 @@
<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="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="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>
-----------------------------------------------------------------------
Summary of changes:
metadata.anidb.net/addon.xml | 2 +-
metadata.anidb.net/anidb.xml | 165 +++++++++++++++++---
metadata.anidb.net/changelog.txt | 6 +-
.../resources/language/English/strings.xml | 9 +-
metadata.anidb.net/resources/settings.xml | 3 +
5 files changed, 158 insertions(+), 27 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
