The branch, dharma has been updated
via 932fa38ee52a8b71fd507d3a115238893ab5a457 (commit)
from 382d1601734615846ac96d523e78ed67457eee1c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=932fa38ee52a8b71fd507d3a115238893ab5a457
commit 932fa38ee52a8b71fd507d3a115238893ab5a457
Author: olympia <[email protected]>
Date: Mon Jul 4 19:41:16 2011 +0200
[metadata.anidb.net] updated to version 1.3.0
diff --git a/metadata.anidb.net/addon.xml b/metadata.anidb.net/addon.xml
index efbaa23..ab2af01 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.2.0"
+ version="1.3.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 59b1271..0625c6f 100644
--- a/metadata.anidb.net/anidb.xml
+++ b/metadata.anidb.net/anidb.xml
@@ -28,10 +28,10 @@
<GetSearchResults clearbuffers="no" dest="4">
<RegExp input="$$4" output="<results>\1</results>" dest="4">
<RegExp conditional="Google" input="$$4" output="\1" dest="4">
- <RegExp input="$$1" output="<url
function="GetSearchResultsExt" gzip="yes"
cache="\1.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=\1</url>"
dest="4">
+ <RegExp conditional="Google" input="$$1" output="<url
function="GetSearchResultsExt" gzip="yes"
cache="\1.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=\1</url>"
dest="4">
<expression clear="yes" repeat="yes">(?i)<a
href="http://anidb\.net/perl-bin/animedb\.pl\?show=anime&amp;aid=(\d+)"</expression>
</RegExp>
- <RegExp input="$$1" output="<url
function="GetSearchResultsExt" gzip="yes"
cache="\1.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=\1</url>"
dest="4+">
+ <RegExp conditional="Google" input="$$1" output="<url
function="GetSearchResultsExt" gzip="yes"
cache="\1.xml">http://api.anidb.net:9001/httpapi?request=anime&client=xbmcscrap&clientver=1&protover=1&aid=\1</url>"
dest="4+">
<expression repeat="yes">(?i)<a
href="http://anidb\.net/a(\d+)"</expression>
</RegExp>
<expression noclean="1"/>
@@ -129,6 +129,9 @@
<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>
<RegExp input="$$2" output="\1" dest="19">
<expression clear="yes"
noclean="1">(?i)(<anime\s+anidbid="$$20".*?</anime>)</expression>
</RegExp>
@@ -150,11 +153,11 @@
<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="8+">
<RegExp input="$$16" output="'\1" dest="16">
<expression clear="yes" repeat="yes"
noclean="1">`?([^`]+)</expression>
</RegExp>
- <expression clear="yes" noclean="1">'(.*)</expression>
+ <expression 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>
@@ -497,6 +500,9 @@
<expression repeat="yes" noclean="1">(?i)(.*?)\r?\n(\*|-)?(\*|-)?[
]*(?:(?:description|written) by)[^\r\n]*</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="6">
+ <expression repeat="yes"
noclean="1">(?i)(.*?)\r?\n[~-]\s+(?:translated and adapted|adapted and
translated)[^\r\n]*cranston[^\r\n]*</expression>
+ </RegExp>
+ <RegExp input="$$6" output="\1" dest="6">
<expression noclean="1">(?:\r?\n)*(.*)</expression>
</RegExp>
<RegExp input="$$6" output="'\1" dest="6">
@@ -518,11 +524,11 @@
<RegExp input="$$1" output="\1" dest="6">
<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 input="$$6"
output="<actor><name>\3</name><role>\1</role><thumb>http://img7.anidb.net/pics/anime/\2</thumb></actor>"
dest="16">
+ <expression clear="yes"
repeat="yes">(?i)<character.*?type="main character
in"[^>]*>.*?<name>([^<]*)</name>.*?<seiyuu[^>]*picture="([^"]*)"[^>]*>([^<]*)</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 conditional="!OnlyMainCast" input="$$6"
output="<actor><name>\3</name><role>\1</role><thumb>http://img7.anidb.net/pics/anime/\2</thumb></actor>"
dest="16+">
+ <expression repeat="yes">(?i)<character.*?type="secondary cast
in"[^>]*>.*?<name>([^<]*)</name>.*?<seiyuu[^>]*picture="([^"]*)"[^>]*>([^<]*)</seiyuu>.*?</character></expression>
</RegExp>
<RegExp input="$$17" output="\1" dest="16+">
<expression noclean="1"
repeat="yes">(?i)(<actor>.*?</actor>)</expression>
@@ -873,11 +879,14 @@
<RegExp input="$$1" output="\1" dest="20">
<expression><anime id="(\d+)"</expression>
</RegExp>
- <RegExp input="$$1"
output="<episode><title>\4</title><url
cache="$$20.xml">\1</url><epnum>\2</epnum><season>1</season><id>\1</id><aired>\3</aired></episode>"
dest="8">
- <expression clear="yes"
repeat="yes">(?i)<episode\s+id="(\d+)"[^>]*>\s*<epno>(\d+)</epno>\s*(?:<length>[^<]*</length>\s*)?(?:<airdate>([^<]+)</airdate>\s*)?(?:<rating[^>]*>[^<]*</rating>\s*)?(?:<title[^>]*>[^<]*</title>\s*)*?<title
xml:lang="en">([^<]+)</title>.*?</episode></expression>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">(?i)<characters>.*?</characters>.*?<episodes>(.*?)</episodes></expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<episode><title>\4</title><url
cache="$$20.xml">\1</url><epnum>\2</epnum><season>1</season><id>\1</id><aired>\3</aired></episode>"
dest="8">
+ <expression clear="yes"
repeat="yes">(?i)<episode\s+id="(\d+)"[^>]*>\s*<epno\s+type="1">(\d+)</epno>\s*(?:<length>[^<]*</length>\s*)?(?:<airdate>([^<]+)</airdate>\s*)?(?:<rating[^>]*>[^<]*</rating>\s*)?(?:<title[^>]*>[^<]*</title>\s*)*?<title
xml:lang="en">([^<]+)</title>.*?</episode></expression>
</RegExp>
- <RegExp input="$$1"
output="<episode><title>\4</title><url
cache="$$20.xml">\1</url><epnum>\2</epnum><season>0</season><id>\1</id><aired>\3</aired></episode>"
dest="8+">
- <expression
repeat="yes">(?i)<episode\s+id="(\d+)"[^>]*>\s*<epno>s(\d+)</epno>\s*(?:<length>[^<]*</length>\s*)?(?:<airdate>([^<]+)</airdate>\s*)?(?:<rating[^>]*>[^<]*</rating>\s*)?(?:<title[^>]*>[^<]*</title>\s*)*?<title
xml:lang="en">([^<]+)</title>.*?</episode></expression>
+ <RegExp input="$$7"
output="<episode><title>\4</title><url
cache="$$20.xml">\1</url><epnum>\2</epnum><season>0</season><id>\1</id><aired>\3</aired></episode>"
dest="8+">
+ <expression
repeat="yes">(?i)<episode\s+id="(\d+)"[^>]*>\s*<epno\s+type="2">s(\d+)</epno>\s*(?:<length>[^<]*</length>\s*)?(?:<airdate>([^<]+)</airdate>\s*)?(?:<rating[^>]*>[^<]*</rating>\s*)?(?:<title[^>]*>[^<]*</title>\s*)*?<title
xml:lang="en">([^<]+)</title>.*?</episode></expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -979,8 +988,7 @@
$$16 ... TheTvDb season number
$$15 ... TheTvDb episode number
$$14 ... Explicit sort order from mapping (true/false)
- $$13 ... Sort season
- $$12 ... Sort episode
+ $$13 ... TheTvDb secondary episode number
-->
<GetEpisodeMappingXMLAPI clearbuffers="no" dest="4">
@@ -1011,13 +1019,16 @@
<expression>~(0)~</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="16">
-
<expression>(?i)<mapping\s+anidbseason="$$19"\s+tvdbseason="(\d+)"\s*>[^<]*;$$18-\d+;[^<]*</mapping></expression>
+
<expression>(?i)<mapping\s+anidbseason="$$19"\s+tvdbseason="(\d+)"\s*>[^<]*;$$18-\d+(?:\+\d+)?;[^<]*</mapping></expression>
</RegExp>
<RegExp input="$$18" output="\1" dest="15">
<expression clear="yes">(\d+)</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="15">
-
<expression>(?i)<mapping\s+anidbseason="$$19"\s+tvdbseason="\d+"\s*>[^<]*;$$18-(\d+);[^<]*</mapping></expression>
+
<expression>(?i)<mapping\s+anidbseason="$$19"\s+tvdbseason="\d+"\s*>[^<]*;$$18-(\d+)(?:\+\d+)?;[^<]*</mapping></expression>
+ </RegExp>
+ <RegExp input="$$6" output="\1" dest="13">
+ <expression
clear="yes">(?i)<mapping\s+anidbseason="$$19"\s+tvdbseason="\d+"\s*>[^<]*;$$18-\d+\+(\d+);[^<]*</mapping></expression>
</RegExp>
<expression>(\d+)</expression>
</RegExp>
@@ -1052,13 +1063,13 @@
<expression
clear="yes">(?i)defaulttvdbseason="$$16"</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="19">
-
<expression>(?i)<mapping\s+anidbseason="(\d+)"\s+tvdbseason="$$16"\s*>[^<]*;\d+-$$15;[^<]*</mapping></expression>
+
<expression>(?i)<mapping\s+anidbseason="(\d+)"\s+tvdbseason="$$16"\s*>[^<]*;\d+-$$15(?:\+\d+)?;[^<]*</mapping></expression>
</RegExp>
<RegExp input="$$15" output="\1" dest="18">
<expression clear="yes">(\d+)</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="18">
-
<expression>(?i)<mapping\s+anidbseason="\d+"\s+tvdbseason="$$16"\s*>[^<]*;(\d+)-$$15;[^<]*</mapping></expression>
+
<expression>(?i)<mapping\s+anidbseason="\d+"\s+tvdbseason="$$16"\s*>[^<]*;(\d+)-$$15(?:\+\d+)?;[^<]*</mapping></expression>
</RegExp>
<RegExp input="$$19-$$18"
output="<displayseason>1</displayseason><displayepisode>\1</displayepisode>"
dest="4">
<expression clear="yes">1-(\d+)</expression>
@@ -1075,11 +1086,23 @@
<RegExp input="$$1" output="\1" dest="5">
<expression clear="yes"
noclean="1">(?i)(<episode>\s*(?:<([^>]+)>[^<]*</\2>\s*)*?<episodename>[^<]+</episodename>\s*(?:<([^>]+)>[^<]*</\3>\s*)*?<episodenumber>$$15</episodenumber>\s*(?:<([^>]+)>[^<]*</\4>\s*)*?<seasonnumber>$$16</seasonnumber>\s*(?:<([^>]+)>[^<]*</\5>\s*)*?</episode>)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression clear="yes"
noclean="1">(?i)(<episode>\s*(?:<([^>]+)>[^<]*</\2>\s*)*?<episodename>[^<]+</episodename>\s*(?:<([^>]+)>[^<]*</\3>\s*)*?<episodenumber>$$13</episodenumber>\s*(?:<([^>]+)>[^<]*</\4>\s*)*?<seasonnumber>$$16</seasonnumber>\s*(?:<([^>]+)>[^<]*</\5>\s*)*?</episode>)</expression>
+ </RegExp>
<RegExp input="$$5"
output="<thumb>http://www.thetvdb.com/banners/\1</thumb>" dest="4">
<expression
clear="yes">(?i)<filename>([^<]+)</filename></expression>
</RegExp>
- <RegExp input="$$5" output="<plot>\1</plot>" dest="4+">
-
<expression>(?i)<overview>([^<]+)</overview></expression>
+ <RegExp input="$$13-$$6"
output="<thumb>http://www.thetvdb.com/banners/\1</thumb>" dest="4+">
+
<expression>(?i)\d+-.*?<filename>([^<]+)</filename></expression>
+ </RegExp>
+ <RegExp input="$$5" output="\1" dest="7">
+ <expression
clear="yes">(?i)<overview>([^<]+)</overview></expression>
+ </RegExp>
+ <RegExp input="$$13-$$6" output="\n\n\1" dest="7+">
+
<expression>(?i)\d+-.*?<overview>([^<]+)</overview></expression>
+ </RegExp>
+ <RegExp input="$$7" output="<plot>\1</plot>" dest="4+">
+ <expression>(.+)</expression>
</RegExp>
<RegExp conditional="SpecialsInside" input="$$6" output="\1" dest="4+">
<RegExp input="$$5" output="\1" dest="16">
diff --git a/metadata.anidb.net/changelog.txt b/metadata.anidb.net/changelog.txt
index a690bbb..beee576 100644
--- a/metadata.anidb.net/changelog.txt
+++ b/metadata.anidb.net/changelog.txt
@@ -1,5 +1,14 @@
-1.0.0:
-Initial commit
+1.3.0:
+Added: Actors thumbnail
+Added: Store AniDB.net ID in database (maybe it'll be useful in future ;))
+Changed: Episodes list correction (unexpected change in xml returned from
AniDB.net)
+Changed: 1->2 episode mapping correction
+Changed: Small plot filtering improvement
+
+1.2.0:
+Changed: Replace "`" with "'" in all significant texts
+Changed: Configuration for genres
+Added: Loading characters + actors/seiyus
1.1.0:
Fixed: Workaround for bug #11377 (causes scraper freezing or wrong parses in
specific cases)
@@ -9,7 +18,6 @@ Added: Possibility to specify sources (URLs) for anidb.xml and
anime-list.xml fi
Added: Possibility to select official title (+language) over main title
Added: Possibility to use personal anime mapping 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
+1.0.0:
+Initial commit
+
-----------------------------------------------------------------------
Summary of changes:
metadata.anidb.net/addon.xml | 2 +-
metadata.anidb.net/anidb.xml | 63 ++++++++++++++++++++++++++------------
metadata.anidb.net/changelog.txt | 20 ++++++++---
3 files changed, 58 insertions(+), 27 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons