diff options
| author | vdrfan <vdrfan@svn> | 2009-10-09 21:38:04 +0000 |
|---|---|---|
| committer | vdrfan <vdrfan@svn> | 2009-10-09 21:38:04 +0000 |
| commit | 42b41fa03d3d23ee8960470e7a1dfcd548e1a31f (patch) | |
| tree | bbc966dc268b600aff3fdf5313f1efb5ed6d2b69 | |
| parent | 989b79f6d079847dea77fba17978a7090d365705 (diff) | |
cosmetic/fixed: unified all scrapers
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23562 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
50 files changed, 550 insertions, 902 deletions
diff --git a/system/scrapers/music/allmusic.xml b/system/scrapers/music/allmusic.xml index 0fed5d4538..abb403d5a8 100644 --- a/system/scrapers/music/allmusic.xml +++ b/system/scrapers/music/allmusic.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<scraper framework="1.1" date="2009-09-20" name="Allmusic" content="albums" thumb="allmusic.png" language="en"> +<scraper framework="1.1" date="2009-09-20" name="Allmusic" content="albums" thumb="allmusic.png" language="en"/> <include>common/htbackdrops.xml</include> <include>common/allmusic.xml</include> <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="htbfanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Grab thumbs from HTBackdrops" type="bool" id="htbthumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -20,7 +20,7 @@ </NfoUrl> <CreateAlbumSearchUrl dest="3"> <RegExp input="$$1" output="<url post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateAlbumSearchUrl> <GetAlbumSearchResults dest="8"> @@ -31,7 +31,7 @@ <RegExp input="$$1" output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>" dest="5+"> <expression repeat="yes" noclean="1,2,3">>([0-9]+)</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumSearchResults> <GetAlbumDetails dest="3"> @@ -42,12 +42,12 @@ <RegExp input="$$1" output="<url cache="am-$$2-album.html" function="GetAMGReview">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>" dest="5+"> <expression noclean="1">sql=([^"]*)">Review</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> <CreateArtistSearchUrl dest="3"> <RegExp input="$$1" output="<url post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=1</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateArtistSearchUrl> <GetArtistSearchResults dest="8"> @@ -58,7 +58,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><genre>\3</genre><year>\5</year><url cache="am-\2-artist.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url></entity>" dest="5+"> <expression repeat="yes" noclean="1,2">style="[^=]*<a href="[^"]*sql=([^"]*)">([^<]*)</a>[^-]*[^>]*>([^<]*)</TD>[^>]*>(&nbsp;)?([^<]*)</td></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetArtistSearchResults> <GetArtistDetails dest="3"> @@ -78,7 +78,7 @@ <RegExp input="$$1" output="<url cache="am-$$2-discog.html" function="GetAMGDiscography">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>" dest="5+"> <expression noclean="1">sql=([^"]*)">Discography</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetArtistDetails> </scraper> diff --git a/system/scrapers/music/allmusic_merlin_lastfm.xml b/system/scrapers/music/allmusic_merlin_lastfm.xml index 455c9a2bcb..9c5c439680 100644 --- a/system/scrapers/music/allmusic_merlin_lastfm.xml +++ b/system/scrapers/music/allmusic_merlin_lastfm.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<scraper framework="1.1" date="2009-09-16" name="allmusic & merlin.pl & lastfm.pl" content="albums" thumb="allmusic.png" language"pl"> +<scraper framework="1.1" date="2009-09-16" name="allmusic & merlin.pl & lastfm.pl" content="albums" thumb="allmusic.png" language="pl"> <include>common/htbackdrops.xml</include> <include>common/allmusic.xml</include> <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="htbfanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Grab thumbs from HTBackdrops" type="bool" id="htbthumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -20,7 +20,7 @@ </NfoUrl> <CreateAlbumSearchUrl dest="3"> <RegExp input="$$1" output="<url post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateAlbumSearchUrl> <GetAlbumSearchResults dest="8"> @@ -31,7 +31,7 @@ <RegExp input="$$1" output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url cache="allmusic-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>" dest="5+"> <expression repeat="yes" noclean="1,2,3">>([0-9]+)</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumSearchResults> <GetAlbumDetails dest="3"> @@ -58,9 +58,9 @@ <expression>\+(.*)</expression> </RegExp> <RegExp input="$$1" output="<url function="MerlinLink">http://merlin.pl/xbmc/browse/search/4,,1.html?phrase=&amp;place=4+simple&amp;carrier=3&amp;offer=O&amp;category=&amp;title=$$6&amp;person=$$7&amp;firm=&amp;date=&amp;isbn=&amp;sort=rank&amp;x=40&amp;y=12</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> <MerlinLink dest="5"> @@ -68,7 +68,7 @@ <RegExp input="$$1" output="<url function="GetReview">http://merlin.pl\1</url>" dest="2"> <expression>Liczba towar[^f]+f="([^"]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </MerlinLink> <GetReview dest="5"> @@ -82,12 +82,12 @@ <RegExp input="$$1" output="\1" dest="2+"> <expression>contents">([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetReview> <CreateArtistSearchUrl dest="3"> <RegExp input="$$1" output="<url post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=1</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateArtistSearchUrl> <GetArtistSearchResults dest="8"> @@ -98,7 +98,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><genre>\3</genre><year>\5</year><url cache="allmusic-artist.html" >http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url></entity>" dest="5+"> <expression repeat="yes" noclean="1,2">style="[^=]*<a href="[^"]*sql=([^"]*)">([^<]*)</a>[^-]*[^>]*>([^<]*)</TD>[^>]*>(&nbsp;)?([^<]*)</td></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetArtistSearchResults> <GetArtistDetails dest="3"> @@ -122,12 +122,12 @@ <expression>\+(.*)</expression> </RegExp> <RegExp input="$$1" output="<url function="LastfmLink">http://ws.audioscrobbler.com/2.0/?method=artist.search&amp;artist=$$6&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp input="$$1" output="<url function="GetAMGDiscography">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>" dest="5+"> <expression noclean="1">sql=([^"]*)">Discography</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetArtistDetails> <LastfmLink dest="5"> @@ -135,7 +135,7 @@ <RegExp input="$$1" output="<url function="GetBiography">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=\2&amp;lang=pl&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>" dest="2"> <expression noclean="1"><artist>.*?<name>([^<]*)</name>.*?<mbid>([^<]*)</mbid></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </LastfmLink> <GetBiography dest="5"> @@ -143,7 +143,7 @@ <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> <expression clear="yes"><content><!\[CDATA\[(.*?)\]</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetBiography> </scraper> diff --git a/system/scrapers/music/common/allmusic.xml b/system/scrapers/music/common/allmusic.xml index 89994e4253..8d48ac0ff1 100644 --- a/system/scrapers/music/common/allmusic.xml +++ b/system/scrapers/music/common/allmusic.xml @@ -10,7 +10,7 @@ <RegExp input="$$3" output="" dest="2"> <expression>(.+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAMGDiscography> <GetAMGBiography dest="5"> @@ -18,7 +18,7 @@ <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> <expression clear="yes">Biography</td>.*?<p>(.*?)</p></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAMGBiography> <GetAMGReview dest="5"> @@ -26,7 +26,7 @@ <RegExp input="$$1" output="<review>\1</review>" dest="2"> <expression>Review</td>.*?<p>(.*?)</p></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAMGReview> <ParseAMGArtist dest="3"> @@ -79,7 +79,7 @@ <RegExp input="$$1" output="<thumb>http://image.allmusic.com/00/amg/pic200/dr\1\200/\1\2\3\4/\1\2\3\4\5.jpg</thumb>" dest="5+"> <expression noclean="1" repeat="yes">"([A-Z^])([0-9^])([0-9^])([0-9^])([^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </ParseAMGArtist> <ParseAMGAlbum dest="3"> @@ -135,7 +135,7 @@ <RegExp input="$$1" output="<thumb>http://image.allmusic.com/\1</thumb>" dest="5+"> <expression noclean="1">http://image.allmusic.com/([^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </ParseAMGAlbum> </scraperfunctions> diff --git a/system/scrapers/music/common/lastfm.xml b/system/scrapers/music/common/lastfm.xml index 307c9a9c45..0c0ed7f011 100644 --- a/system/scrapers/music/common/lastfm.xml +++ b/system/scrapers/music/common/lastfm.xml @@ -4,7 +4,7 @@ <RegExp input="$$1" output="<album><title>\1</title></album>" dest="2+"> <expression repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetLastFMDiscography> </scraperfunctions> diff --git a/system/scrapers/music/discogs.xml b/system/scrapers/music/discogs.xml index d727e9fa93..65edb29fee 100644 --- a/system/scrapers/music/discogs.xml +++ b/system/scrapers/music/discogs.xml @@ -4,12 +4,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="htbfanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Grab thumbs from HTBackdrops" type="bool" id="htbthumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -74,7 +74,7 @@ <RegExp input="$$1" output="<url function="GetImages">http://www.discogs.com\1</url>" dest="5+"> <expression><a href="(/viewimages\?release=[^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> <GetImages dest="5"> diff --git a/system/scrapers/music/freebase.xml b/system/scrapers/music/freebase.xml index f953053b19..799048dee1 100644 --- a/system/scrapers/music/freebase.xml +++ b/system/scrapers/music/freebase.xml @@ -4,12 +4,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="htbfanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Grab thumbs from HTBackdrops" type="bool" id="htbthumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -17,13 +17,11 @@ <expression>(http://www.freebase.com/view/)(.*)</expression> </RegExp> </NfoUrl> - <CreateAlbumSearchUrl dest="3"> <RegExp input="$$1" output="http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name~=%22:%22$$2%22,%22album%22:[{%22guid%22:null,%22artist%22:null,%22name%22:null,%22name~=%22:%22\1%22}]}}" dest="3"> <expression/> </RegExp> </CreateAlbumSearchUrl> - <GetAlbumSearchResults dest="8"> <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><artist>\1</artist><title>\3</title><url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name%22:null,%22genre%22:[],%22album%22:[{%22id%22:%22/guid/\2%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22label%22:[],%22engineer%22:[],%22producer%22:[],%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22track%22:[{%22name%22:null,%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}],%22sort%22:%22release_date%22}]}}</url></entity>" dest="5+"> @@ -32,7 +30,6 @@ <expression noclean="1"/> </RegExp> </GetAlbumSearchResults> - <GetAlbumDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<artist>\1</artist>" dest="5"> @@ -71,25 +68,22 @@ <RegExp input="$$1" output="<url function="GetAlbumReview">http://www.freebase.com/api/trans/raw/guid/\1</url>" dest="5+"> <expression noclean="1">article":.*?"guid": "#([^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> - <GetAlbumReview dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<review>\1</review>" dest="2"> <expression noclean="1"><p>([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumReview> - <CreateArtistSearchUrl dest="3"> <RegExp input="$$1" output="http://www.freebase.com/api/service/search?query=\1&type=/music/artist&indent=1" dest="3"> <expression/> </RegExp> </CreateArtistSearchUrl> - <GetArtistSearchResults dest="8"> <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22id%22:%22/guid/\1%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22name%22:null,%22genre%22:[],%22album%22:[],%22active_start%22:null,%22active_end%22:null,%22instruments_played%22:[]}}</url></entity>" dest="5+"> @@ -98,7 +92,6 @@ <expression noclean="1"/> </RegExp> </GetArtistSearchResults> - <GetArtistDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<name>\1</name>" dest="5"> @@ -137,13 +130,12 @@ <expression noclean="1"/> </RegExp> </GetArtistDetails> - <GetBiography dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> <expression noclean="1"><p>([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetBiography> </scraper> diff --git a/system/scrapers/music/israel-music.xml b/system/scrapers/music/israel-music.xml index ea03292259..b25faf5b4f 100644 --- a/system/scrapers/music/israel-music.xml +++ b/system/scrapers/music/israel-music.xml @@ -7,21 +7,21 @@ </NfoUrl> <CreateAlbumSearchUrl dest="3"> <RegExp input="$$1" output='http://he.israel-music.com/search/\1/' dest="3"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$2%20$$1" output='http://he.israel-music.com/search/\1/' dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateAlbumSearchUrl> <GetAlbumSearchResults dest="8"> - <RegExp input="$$5" output='<?xml version="1.0" encoding="utf-8" standalone="yes"?><results>\1</results>' dest="8"> + <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output='<entity><url>http://he.israel-music.com\1</url><title>\2</title></entity>' dest="5+"> <expression repeat="yes" noclean='1,2'><![CDATA[<strong><a dir="rtl" href="(.[^"]*)">(.[^<]*)</a>]]></expression> </RegExp> <RegExp input="$$1" output='<entity><url>http://he.israel-music.com\1</url><title>\2</title><artist>\4</artist><year>\5</year></entity>' dest="5+"> <expression repeat="yes" noclean='1,3,4,5'><![CDATA[<strong><a dir="rtl" href="(.[^"]*)">(.*?)</a> - <a dir="rtl" href="(.[^"]*)">(.[^<]*)</a> <span>([0-9]*)</span></strong>]]></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumSearchResults> <GetAlbumDetails dest="3"> @@ -47,7 +47,7 @@ <RegExp input="$$6" output="<genre>\1</genre>" dest="5+"> <expression noclean="1" repeat="yes"><![CDATA[<a.[^>]*">(.[^<]*)</a>]]></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> </scraper> diff --git a/system/scrapers/music/lastfm.xml b/system/scrapers/music/lastfm.xml index 698ce2045b..40c7f2280a 100644 --- a/system/scrapers/music/lastfm.xml +++ b/system/scrapers/music/lastfm.xml @@ -5,12 +5,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="htbfanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Grab thumbs from HTBackdrops" type="bool" id="htbthumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -57,7 +57,7 @@ <RegExp input="$$1" output="<url function="GetTracks">http://ws.audioscrobbler.com/2.0/?method=playlist.fetch&amp;playlistURL=lastfm://playlist/album/\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>" dest="5+"> <expression noclean="1"><id>(.*?)</id></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetAlbumDetails> <GetTracks dest="5"> diff --git a/system/scrapers/video/Excalibur.xml b/system/scrapers/video/Excalibur.xml index da94649863..d3f626d92c 100644 --- a/system/scrapers/video/Excalibur.xml +++ b/system/scrapers/video/Excalibur.xml @@ -5,22 +5,19 @@ <expression noclean="1">excaliburfilms.com/AdultDVD/([^.]*)</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://search.excaliburfilms.com/excals.htm?searchString=\1&amp;Search=AdultDVDMovies&amp;SearchFor=Title.x</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="6"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="6"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.excaliburfilms.com/AdultDVD/\1</url></entity>" dest="5+"> <expression trim="1" repeat="yes"><a href="http://www.ExcaliburFilms.com/AdultDVD/([^"]*)".*?<font class="searchTitle13">([^<]*)</font></a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<thumb>http://images.excaliburfilms.com/DVD/reviews/imagesBB020609/largemoviepic/\1.jpg</thumb>" dest="5+"> @@ -59,7 +56,7 @@ <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> <expression>/Stars_([0-9]).gif</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/KinoPoisk.xml b/system/scrapers/video/KinoPoisk.xml index f9f7c5e80d..fbddd2ae7f 100644 --- a/system/scrapers/video/KinoPoisk.xml +++ b/system/scrapers/video/KinoPoisk.xml @@ -1,40 +1,36 @@ <?xml version="1.0" encoding="windows-1251"?> <scraper framework="1.1" date="2009-08-08" name="KinoPoisk" content="movies" thumb="KinoPoisk.gif" ServerContentEncoding="CP1251" language="ru"> - <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label=" ( )" type="bool" id="fanartP" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label=" ( )" type="bool" id="fanartR" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label=" (www.themoviedb.org) ( )" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label=" (www.themoviedb.org) +24 ( )" type="bool" id="fanartF" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label=" (www.imdb.com)" type="bool" id="trailerI" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.kinopoisk.ru/index.php?level=7&from=forma&result=adv&m_act%5Bfrom%5D=forma&m_act%5Bwhat%5D=content&m_act%5Bfind%5D=\1&m_act%5Byear%5D=&m_act%5Bcountry%5D=&m_act%5Bgenre%5D=&m_act%5Bcompany%5D=&m_act%5Bmpaa%5D=&m_act%5Bactor%5D=&m_act%5Bcast%5D=&m_act%5Bcontent_find%5D=" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="windows-1251" standalone="yes"?><results>\1</results>" dest="8"> - <RegExp input="$$7" output="<entity>\1</entity>" dest="5+"> <RegExp input="$$1" output="$$1" dest="6"> <expression clear="yes">img src="/images/title002.gif"</expression> </RegExp> - <RegExp input="$$6" output="<title>\1 " dest="7"> <expression trim="1"><title>([^<]+)</title></expression> </RegExp> @@ -44,13 +40,12 @@ <RegExp input="$$6" output="<url>http://www.kinopoisk.ru/level/1/film/\1</url>" dest="7+"> <expression>href="/level/19/film/([^"]+)" class="all">\.\.\.</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <RegExp input="$$1" output="<entity><title>\2 (\3)</title><url>http://www.kinopoisk.ru/level\1</url></entity>" dest="5+"> <expression repeat="yes"><a class="all" href="/level([^"]*)">([^<]*)</a>,&nbsp;<a[^>]*>([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> @@ -71,7 +66,6 @@ <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> <expression><tr><td class="desc-title" height=25><img[^>]+> MPAA</td><td class="desc-data".*?><a href=.+?/rn/(.+?)/</expression> </RegExp> - <RegExp input="$$1" output="<certification>\1 \3</certification>" dest="5+"> <expression repeat="yes"><a href="/List\?certificates=[^"]*">([^<]*)</a>[^<]*(<i>([^<]*)</i>)?</expression> </RegExp> @@ -95,12 +89,10 @@ <RegExp input="$$1" output="<url function="STT">http://www.kinopoisk.ru\1</url>" dest="5+"> <expression>href="([^"]+)"><b><font color="#ff6600"></font><font color="#555555"></font></expression> </RegExp> - <!-- DIRECTORS WRITERS ACTORS --> <RegExp input="$$1" output="<url function="PEOPLE">http://www.kinopoisk.ru/level/19/film/\1</url>" dest="5+"> <expression>href="/level/19/film/([^"]+)" class="all">\.\.\.</a></expression> </RegExp> - <!-- OUTLINE PLOT --> <RegExp input="$$1" output="\1&#133;&hellip;&laquo;&#151;&mdash;&nbsp;" dest="2"> <expression noclean="1"><tr><td colspan=3 style="padding:10px;padding-left:20px;" class="news">[\t\n]*(.*?)[\t\n]*</td></tr>\s+<tr><td colspan=3 height=5><spacer type=block height=5></td></tr></expression> @@ -127,43 +119,36 @@ <expression trim="1">(.*)\.\.\.</expression> </RegExp> <!-- POSTERS --> - <RegExp input="$$1" output="<url function="GMP">http://www.kinopoisk.ru/level/17/film/\1</url>" dest="5+"> <expression>href="/level/17/film/([^"]+)"</expression> </RegExp> <RegExp input="$$1" output="<url cache="KinoPoisk_opa.html" function="GetPoster">http://www.kinopoisk.ru/</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp conditional="fanartP" input="$$1" output="<url function="GMF">http://www.kinopoisk.ru/level/13/film/\1</url>" dest="5+"> <expression>href="/level/13/film/([^"]+)"</expression> </RegExp> <RegExp conditional="fanartR" input="$$1" output="<url function="GMFR">http://www.kinopoisk.ru/level/12/film/\1</url>" dest="5+"> <expression>href="/level/12/film/([^"]+)"</expression> </RegExp> - <RegExp conditional="fanart" input="$$8" output="<url function="GMA">http://themoviedb.org/search?search%5Btext%5D=\1</url>" dest="5+"> <RegExp input="$$1" output="\2" dest="8"> <expression><span style="font-size:13px;color:#666">(The )?([^<]+)</span></expression> </RegExp> <expression/> </RegExp> - <RegExp conditional="fanartF" input="$$8" output="<url function="GMAF">http://themoviedb.org/search?search%5Btext%5D=\1</url>" dest="5+"> <RegExp input="$$1" output="\2" dest="8"> <expression><span style="font-size:13px;color:#666">(The )?([^<]+)</span></expression> </RegExp> <expression/> </RegExp> - <RegExp input="$$1" output="<url cache="KinoPoisk_opa.html" function="GetFanart">http://www.kinopoisk.ru/</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - </GetDetails> - <GMTR dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://akas.imdb.com/video/imdb/vi\1/player</url>" dest="7"> @@ -172,10 +157,9 @@ <RegExp input="$$7" output="<url function="GetTrailer">\1</url>" dest="9"> <expression noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMTR> - <GetTrailer clearbuffers="no" dest="5"> <RegExp conditional="trailer" input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> <RegExp input="$$1" output="\1" dest="2"> @@ -184,10 +168,9 @@ <RegExp input="$$1" output="$$2/\1" dest="2"> <expression noclean="1">"id"[^"]*"([^"]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetTrailer> - <GMA dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://www.themoviedb.org/movie/\1/backdrops</url>" dest="7"> @@ -196,10 +179,9 @@ <RegExp input="$$7" output="<url function="GMFFS">\1</url>" dest="9"> <expression noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMA> - <GMAF dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://www.themoviedb.org/movie/\1/backdrops</url>" dest="7"> @@ -208,22 +190,19 @@ <RegExp input="$$7" output="<url function="GMFFS">\1</url>" dest="9"> <expression repeat="yes" noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMAF> - <GMFFS dest="10" clearbuffers="no"> <RegExp input="$$1" output="<thumb>http://www.themoviedb.org/image/backdrops/\1</thumb>" dest="6+"> <expression repeat="yes" noclean="1"><a href="/image/backdrops/([^"]+)"</expression> </RegExp> </GMFFS> - <GMFFSS clearbuffers="no" dest="5"> <RegExp input="$$1" output="<thumb>\1</thumb>" dest="6+"> <expression repeat="yes" noclean="1"><backdrop size="original">([^<]+)</backdrop></expression> </RegExp> </GMFFSS> - <GMF dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://www.kinopoisk.ru\1</url>" dest="7"> @@ -232,16 +211,14 @@ <RegExp input="$$7" output="<url function="GMFF">\1</url>" dest="9"> <expression repeat="yes" noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMF> - <GMFF clearbuffers="no" dest="5"> <RegExp input="$$1" output="<thumb>http://www.kinopoisk.ru\1</thumb>" dest="6+"> <expression noclean="1"><img.+?src='([^']*kadr[^']*)'.+?style="border:1px solid #777" onLoad=''></a></td></expression> </RegExp> </GMFF> - <GMFR dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://www.kinopoisk.ru\1</url>" dest="7"> @@ -250,17 +227,14 @@ <RegExp input="$$7" output="<url function="GMFFR">\1</url>" dest="9"> <expression repeat="yes" noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMFR> - <GMFFR clearbuffers="no" dest="5"> <RegExp input="$$1" output="<thumb>http://www.kinopoisk.ru\1</thumb>" dest="6+"> <expression noclean="1"><img.+?src='([^']*wallpaper[^']*)'.+?style="border:1px solid #777" onLoad=''></a></td></expression> </RegExp> </GMFFR> - - <GMP dest="10"> <RegExp input="$$9" output="<details>\1</details>" dest="10"> <RegExp input="$$1" output="<url>http://www.kinopoisk.ru\1</url>" dest="7"> @@ -269,30 +243,24 @@ <RegExp input="$$7" output="<url function="GMPP">\1</url>" dest="9"> <expression repeat="yes" noclean="1"><url>([^<]+)</url></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GMP> - <GMPP clearbuffers="no" dest="5"> <RegExp input="$$1" output="<thumb>http://www.kinopoisk.ru\1</thumb>" dest="6+"> <expression noclean="1"><img.+?src='([^']*poster[^']*)'.+?style="border:1px solid #777" onLoad=''></a></td></expression> </RegExp> </GMPP> - - <GetPoster dest="5"> <RegExp input="$$6" output="<details>\1</details>" dest="5"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetPoster> - <GetFanart dest="5"> <RegExp input="$$6" output="<details><fanart>\1</fanart></details>" dest="5"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetFanart> - - <STT dest="10"> <RegExp input="$$1" output="\2" dest="8"> <expression noclean="2"><table(.*?):(.*?)</table></expression> @@ -301,7 +269,6 @@ <expression trim="1"><a [^>]*>([^<]+)</a></expression> </RegExp> </STT> - <PEOPLE dest="10"> <RegExp input="$$7" output="<details>\1</details>" dest="10"> <!-- actors --> @@ -311,7 +278,6 @@ <RegExp input="$$8" output="<actor><name>\3</name><thumb spoof="http://www.kinopoisk.ru/">http://www.kinopoisk.ru/\1</thumb></actor>" dest="7"> <expression trim="3" repeat="yes">img src="([^"]+)" width=52 style="border:1px solid #ccc"(.+?)a href=".*?people[^"]*" class="all">([^<]+)</a></expression> </RegExp> - <!-- director --> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1"><tr><td colspan=3><a name="director"></td></tr>(.*?)<tr><td colspan=3 style="border-top:1px solid #ccc"><br /></td></tr></expression> @@ -319,7 +285,6 @@ <RegExp input="$$8" output="<director>\3</director>" dest="7+"> <expression trim="3" repeat="yes">img src="([^"]+)" width=52 style="border:1px solid #ccc"(.+?)a href=".*?people[^"]*" class="all">([^<]+)</a></expression> </RegExp> - <!-- writers --> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1"><tr><td colspan=3><a name="writer"></td></tr>(.*?)<tr><td colspan=3 style="border-top:1px solid #ccc"><br /></td></tr></expression> @@ -327,7 +292,6 @@ <RegExp input="$$8" output="<credits>\3</credits>" dest="7+"> <expression trim="3" repeat="yes">img src="([^"]+)" width=52 style="border:1px solid #ccc"(.+?)a href=".*?people[^"]*" class="all">([^<]+)</a></expression> </RegExp> - <!-- producer --> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1"><tr><td colspan=3><a name="producer"></td></tr>(.*?)<tr><td colspan=3 style="border-top:1px solid #ccc"><br /></td></tr></expression> @@ -335,8 +299,7 @@ <RegExp input="$$8" output="<producer>\3</producer>" dest="7+"> <expression trim="3" repeat="yes">img src="([^"]+)" width=52 style="border:1px solid #ccc"(.+?)a href=".*?people[^"]*" class="all">([^<]+)</a></expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </PEOPLE> </scraper> diff --git a/system/scrapers/video/MyMovies.xml b/system/scrapers/video/MyMovies.xml index 1598be8a7e..0413458cf4 100644 --- a/system/scrapers/video/MyMovies.xml +++ b/system/scrapers/video/MyMovies.xml @@ -1,72 +1,68 @@ <?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2009-08-08" name="MyMovies.it" content="movies" thumb="MyMovies.png" language="it"> - <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Full Cast Credits" type="bool" id="fullcredits" default="true"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Full Cast Credits > Get Director(s)" type="bool" id="viewDirector" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Full Cast Credits > Get Actors" type="bool" id="viewActors" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Full Cast Credits > Get Filmmakers" type="bool" id="viewFilmmakers" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Full Cast Credits > Cast Separeted by Fake Actor" type="bool" id="fakeactor" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get All Thumbs" type="bool" id="thumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get Trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get Critic" type="bool" id="critic" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get Pubblic" type="bool" id="public" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get Forum" type="bool" id="forum" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Get Frasi Celebri" type="bool" id="frasi_celebri" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Rating x of 10" type="bool" id="rating_ten" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Director, Critics, and Public Rating" type="bool" id="other_rating" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Director, Critics, and Public Rating > Insert into:" type="labelenum" values="mpaa|outline|studio" id="tag_other_rating" default="mpaa"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="\1" dest="3"> <expression noclean="1">(http://www\.mymovies\.it/dizionario/recensione\.asp\?id=[0-9]+)</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.mymovies.it/database/ricerca/?q=\1" dest="3"> <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2 (\3, \4)</title><url>http://www.mymovies.it/dizionario/recensione.asp?id=\1</url><id>\1</id></entity>" dest="5"> @@ -75,58 +71,47 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails clearbuffers="no" dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<title>\1</title><year>\2</year>" dest="5+"> <expression noclean="1"><title>(.+).\((.+)\)</title></expression> </RegExp> - <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression noclean="1">durata ([0-9]*) min\.</expression> </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> <expression noclean="1"><a title="Film ([^"]*)" href="http://www.mymovies.it/film/([^"]*)">([^<]*)</a></expression> </RegExp> - <!-- Director(s) --> <RegExp input="$$1" output="\1" dest="4"> <expression noclean="1">Un film di (.+)Con <a</expression> </RegExp> - <RegExp input="$$4" output="<director>\1</director>" dest="5+"> <expression repeat="yes" noclean="1">[^A-Z]*([^\.^,^<]+)[^\.^,]*[\.,]</expression> </RegExp> - <!-- Writer(s) --> <RegExp output="<url cache="$$2-fullcredits.html" function="GetMovieWriters">http://www.mymovies.it/cast/?id=$$2</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Tagline --> <RegExp input="$$1" output="<tagline>\1</tagline>" dest="5+"> <expression noclean="1"><strong class="courier" style="font-size:23px; margin-bottom:10px; color:#ff0066; display:block;">([^<]+)</strong></expression> </RegExp> - <!-- Rating --> <!-- rating map array --> <RegExp conditional="rating_ten" output="<r>0.1-0.2</r><r>0.2-0.4</r><r>0.3-0.6</r><r>0.4-0.8</r><r>0.5-1.0</r><r>0.6-1.2</r><r>0.7-1.4</r><r>0.8-1.6</r><r>0.9-1.8</r><r>1.0-2.0</r><r>1.1-2.2</r><r>1.2-2.4</r><r>1.3-2.6</r><r>1.4-2.8</r><r>1.5-3.0</r><r>1.6-3.2</r><r>1.7-3.4</r><r>1.8-3.6</r><r>1.9-3.8</r><r>2.0-4.0</r><r>2.1-4.2</r><r>2.2-4.4</r><r>2.3-4.6</r><r>2.4-4.8</r><r>2.5-5.0</r><r>2.6-5.2</r><r>2.7-5.4</r><r>2.8-5.6</r><r>2.9-5.8</r><r>3.0-6.0</r><r>3.1-6.2</r><r>3.2-6.4</r><r>3.3-6.6</r><r>3.4-6.8</r><r>3.5-7.0</r><r>3.6-7.2</r><r>3.7-7.4</r><r>3.8-7.6</r><r>3.9-7.8</r><r>4.0-8.0</r><r>4.1-8.2</r><r>4.2-8.4</r><r>4.3-8.6</r><r>4.4-8.8</r><r>4.5-9.0</r><r>4.6-9.2</r><r>4.7-9.4</r><r>4.8-9.6</r><r>4.9-9.8</r><r>5.0-10.0</r><r>n.d- </r>" dest="4"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Average --> <RegExp input="$$1" output="\1.\2" dest="6"> <expression noclean="1">Giudizio medio[^,]+([0-9]),?([0-9]?)/5</expression> </RegExp> - <RegExp conditional="rating_ten" input="$$4" output="\1" dest="6"> <expression noclean="1">$$6-([^<]+)</expression> </RegExp> <RegExp input="$$6" output="<rating>\1</rating>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Others Rating --> <RegExp conditional="other_rating" input="$$6" output="<$INFO[tag_other_rating]>\1</$INFO[tag_other_rating]>" dest="5+"> <!-- Dizionari --> @@ -141,9 +126,8 @@ <RegExp input="$$1" output=" / Pubblico: \1.\2" dest="6+"> <expression noclean="1"><b>Pubblico</b> \(([0-9]+),?([0-9]?)/5\)<br /></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Cast --> <RegExp conditional="!fullcredits" input="$$6" output="\1" dest="5+"> <RegExp input="$$1" output="\1" dest="4"> @@ -152,71 +136,62 @@ <RegExp input="$$4" output="<actor><name>\1</name></actor>" dest="6"> <expression repeat="yes" noclean="1">[^A-Z]*([^\.^,^<]+)[^\.^,]*[\.,]</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Full Cast --> <RegExp conditional="fullcredits" output="<url cache="$$2-fullcredits.html" function="GetMovieCast">http://www.mymovies.it/cast/?id=$$2</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Thumb --> <RegExp conditional="!thumbs" input="$$1" output="<thumb>\1</thumb>" dest="5+"> <expression noclean="1"><a title="Locandina[^"]+" href="[^"]+"><img style="border:solid 1px \#AEAEAE; padding:3px;" src="([^"]+)" width="150px" alt="Locandina[^"]+" /></a></expression> </RegExp> <!-- else All Thumbs --> <RegExp conditional="thumbs" output="<url function="GetMovieThumbs">http://www.mymovies.it/poster/?id=$$2</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Trailer: not always present --> <RegExp conditional="trailer" input="$$1" output="<url function="GetMovieTrailer">\1</url>" dest="5+"> <expression><span class="rec_link_disattivo"><a title="[^"]+" href="([^"]+)">Trailer</a></span></expression> </RegExp> - <!-- Plot: It is used for report many information...It will be write on correct buffer (5) at the end --> <RegExp input="$$1" output="\1" dest="10"> <expression><p style="text-align:justify;">(.+?)</p></expression> </RegExp> - <!-- Plot: all that you want append... --> <RegExp conditional="critic" output="<url function="GetMovieCritic">http://www.mymovies.it/recensioni/?id=$$2</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp conditional="public" output="<url function="GetMoviePublic">http://www.mymovies.it/pubblico/?id=$$2</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp conditional="forum" output="<url function="GetMovieForum">http://www.mymovies.it/forum/?id=$$2</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp conditional="frasi_celebri" output="<url function="GetMovieFrasiCelebri">http://www.mymovies.it/battute/?id=$$2</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Plot: ...at the end --> <!-- non serve a un cazzo l'url (già cached), ma è l'unico modo per vedere il buffer 10 istanziato nella GetDetails, e i buffer 11,12,13 istanziati nelle altre fuzioni --> <RegExp output="<url cache="$$2-fullcredits.html" function="AppendToPlot">http://www.mymovies.it/cast/?id=$$2</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <GetMovieWriters clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<credits>\1</credits>" dest="2"> <expression repeat="yes" noclean="1">http://www\.mymovies\.it/biografia/\?s=[^>]+>([^<]+)[^\(]+\(Soggetto\)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieWriters> - <GetMovieTrailer clearbuffers="no" dest="5"> <RegExp input="$$1" output="<details><trailer>\1</trailer></details>" dest="5"> <expression noclean="1">flashvars="file=([^&]+)</expression> </RegExp> </GetMovieTrailer> - <GetMovieThumbs clearbuffers="no" dest="5"> <RegExp input="$$3" output="<details>\1</details>" dest="5"> <!-- Mask unnecessary part of source...is necessary when there is one thumb only --> @@ -227,17 +202,16 @@ <RegExp input="$$2" output="<thumb>\1</thumb>" dest="3"> <expression repeat="yes" noclean="1"><img[^/]+src="([^"]+)" /></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieThumbs> - <GetMovieCast clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <!-- Director(s) --> <RegExp conditional="viewDirector" input="$$3" output="\1" dest="2"> <!-- Fake Actor for Section delimiter: Regia --> <RegExp conditional="fakeactor" output="<actor><name>.Regia</name></actor>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <!-- Mask unnecessary part of source --> <RegExp input="$$1" output="\1" dest="6"> @@ -246,14 +220,13 @@ <RegExp input="$$6" output="<actor><thumb>\1</thumb><name>\2</name><role>Regista</role></actor>" dest="3+"> <expression repeat="yes" noclean="1"><div class="linkblu" style="padding:3px; padding-left:20px;">[^<]+(?:<a href="[^"]+" title="[^"]+"><img style="float:left; margin-right:3px;" src="([^"]+)" width="80" alt="[^"]+" /></a>)?[^\?]+\?[^>]+>([^<]+)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Actors --> <RegExp conditional="viewActors" input="$$3" output="\1" dest="2"> <!-- Fake Actor for Section delimiter: Cast artistico --> <RegExp conditional="fakeactor" output="<actor><name>.Cast artistico</name></actor>" dest="3+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <!-- Mask unnecessary part of source --> <RegExp input="$$1" output="\1" dest="6"> @@ -263,14 +236,13 @@ <RegExp input="$$6" output="<actor><thumb>\1</thumb><name>\2</name><role>\3</role></actor>" dest="3+"> <expression repeat="yes" noclean="1"><div class="linkblu" style="padding:3px; padding-left:20px;">[^<]+(?:<a href="[^"]+" title="[^"]+"><img style="float:left; margin-right:3px;" src="([^"]+)" width="80" alt="[^"]+" /></a>)?[^\?]+\?[^>]+>([^<]+)</a>[^%]+(?:<span style="font-size:120%; padding-left:10px;">interpreta <strong><em>([^<]+)</strong></em></span>)?[^<]+<span style="font-size:120%;"></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Filmmakers --> <RegExp conditional="viewFilmmakers" input="$$3" output="\1" dest="2"> <!-- Fake Actor for Section delimiter: Filmmakers --> <RegExp conditional="fakeactor" output="<actor><name>.Filmmakers</name></actor>" dest="3+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <!-- Mask unnecessary part of source --> <RegExp input="$$1" output="\1" dest="6"> @@ -280,54 +252,49 @@ <RegExp input="$$6" output="<actor><thumb>\1</thumb><name>\2</name><role>\3</role></actor>" dest="3+"> <expression repeat="yes" noclean="1"><div class="linkblu" style="padding:3px; padding-left:20px;">[^<]+(?:<a href="[^"]+" title="[^"]+"><img style="float:left; margin-right:3px;" src="([^"]+)" width="80" alt="[^"]+" /></a>)?[^\?]+\?[^>]+>([^<]+)</a>[^\(]+\(([^\)]+)\)</span></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieCast> - <!-- Mancano i commenti estesi --> <GetMovieCritic clearbuffers="no" dest="5"> <RegExp input="$$2" output="\n\n:: Critica\n\1" dest="11"> <RegExp input="$$1" output="\n\1 - \2\n\3\n" dest="2"> <expression repeat="yes"><a href="http://www.mymovies.it/dizionario/critica.asp\?id=[^"]+">([^<]+)</a>[^<]*<strong><em>([^<]+)</em></strong>.+?style="color:\#333333; margin-bottom:10px;">(.+?)</span></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieCritic> - <!-- Mancano i commenti estesi --> <GetMoviePublic clearbuffers="no" dest="5"> <RegExp input="$$2" output="\n\n:: Pubblico\n\1" dest="12"> <RegExp input="$$1" output="\1\n" dest="2"> <expression repeat="yes"><div id="parziale[^"]+" class="linkrosa" style="color:\#333333; margin-bottom:10px;">(.+?)</div></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMoviePublic> - <!-- Mancano i commenti estesi --> <GetMovieForum clearbuffers="no" dest="5"> <RegExp input="$$2" output="\n\n:: Forum\n\1" dest="13"> <RegExp input="$$1" output="\1\n" dest="2"> <expression repeat="yes"><div id="parziale[^"]+" class="linkrosa" style="color:\#333333; margin-bottom:10px;">(.+?)</div></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieForum> - <GetMovieFrasiCelebri clearbuffers="no" dest="5"> <RegExp input="$$2" output="\n\n:: Frasi Celebri\n\1" dest="14"> <RegExp input="$$1" output="\1\n" dest="2"> <expression repeat="yes"><div style="text-align:justify;">(.+?)</div></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMovieFrasiCelebri> - <AppendToPlot clearbuffers="no" dest="5"> <RegExp input="$$10$$11$$12$$13$$14" output="<details><plot>\1</plot></details>" dest="5"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </AppendToPlot> </scraper> diff --git a/system/scrapers/video/adultcdmovies.xml b/system/scrapers/video/adultcdmovies.xml index 0c87de6256..5900b37ee0 100644 --- a/system/scrapers/video/adultcdmovies.xml +++ b/system/scrapers/video/adultcdmovies.xml @@ -6,7 +6,7 @@ </NfoUrl> <CreateSearchUrl dest="2"> <RegExp input="$$1" output="http://www.adultcdmovies.net/e-pmsearch.aspx?SearchType=0&SearchTerm=\1" dest="2"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -14,7 +14,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.adultcdmovies.net/\1.aspx?</url></entity>" dest="5"> <expression repeat="yes"></td><td><a href="(adult-dvd-[^genre].[^\.]*)\.aspx\?">(.[^/]*)</a></td></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="3"> @@ -32,7 +32,7 @@ <expression>Studio: <.[^>]*>(.[^/]*)</a></expression> </RegExp> <RegExp input="$$1" output="<genre>Adult</genre>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">Categories &amp; Genres:(.*)Starring</expression> @@ -53,7 +53,7 @@ </RegExp> <expression repeat="yes"><a href=".[^"]*">(.[^/]*) DVD</a></expression> </RegExp> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$6" output="<actor><name>\1</name></actor>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> @@ -61,7 +61,7 @@ </RegExp> <expression repeat="yes">\?">(.[^/]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/adultdvdempire.xml b/system/scrapers/video/adultdvdempire.xml index 36781ba3f1..ed2f9a0ac1 100644 --- a/system/scrapers/video/adultdvdempire.xml +++ b/system/scrapers/video/adultdvdempire.xml @@ -5,72 +5,58 @@ <expression noclean="1">adultdvdempire.com/itempage.aspx?item_id=([0-9]*)</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.adultdvdempire.com/SearchTitlesPage.aspx?SearchString=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="6"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="6"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.adultdvdempire.com/\1</url></entity>" dest="5"> <expression repeat="yes">ListItem_ItemTitle"><a href="/([^"]*)">([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<thumb>http://\1.dvdempire.com/res/movies/\2h.jpg</thumb>" dest="5+"> <expression>BoxCover_Container">[^>]*><img src="http://(.*?).dvdempire.com/res/movies/([^m]*)</expression> </RegExp> - <RegExp input="$$1" output="<thumb>http://\1.dvdempire.com/res/movies/\2bh.jpg</thumb>" dest="5+"> <expression>BoxCover_Container">[^>]*><img src="http://(.*?).dvdempire.com/res/movies/([^m]*)</expression> </RegExp> - <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression>Item_Title">([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> <expression>StudioProductionRating">([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression>Year: ([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<tagline>\1</tagline><plot>\2</plot>" dest="5+"> <expression>InfoTagLine">([^<]*)<[^>]*>[^ ]*([^<]*)<</expression> </RegExp> - <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression>Item_InfoContainer">([^<]*)<</expression> </RegExp> - <RegExp input="$$1" output="<actor><name>\3</name><thumb>http://images.dvdempire.com/pornstar/actors/\1.jpg</thumb></actor>" dest="5+"> <expression repeat="yes"><a href="/([0-9]*)/([^"]*)-Pornstars.html">([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> <expression repeat="yes">media_id=[^i]*item_id=[^>]*>([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression>>Length: ([^<]*)<</expression> </RegExp> - <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> <expression>>Rating: ([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<director>\3</director>" dest="5+"> <expression repeat="yes"><a href="/([0-9]*)/([^"]*)-Directors.html">([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/adultfilmdatabase.xml b/system/scrapers/video/adultfilmdatabase.xml index 31a10c5fdd..f3b431084b 100644 --- a/system/scrapers/video/adultfilmdatabase.xml +++ b/system/scrapers/video/adultfilmdatabase.xml @@ -6,7 +6,7 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url spoof="http://www.adultfilmdatabase.com" post="true">http://www.adultfilmdatabase.com/lookup.cfm?SearchType=Video&amp;Action=Lookup&amp;Find=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="6"> @@ -20,7 +20,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.adultfilmdatabase.com/video.cfm?videoid=\1</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes"><a HREF="/video\.cfm\?videoid=([0-9]*)"><U>([^<]*)</U></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="3"> @@ -41,7 +41,7 @@ <expression>Year:</td><td STYLE="font-size:11px;padding-left: 3px;" WIDTH="100%">([0-9]+)</td></expression> </RegExp> <RegExp input="$$1" output="<genre>Adult</genre>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$6" output="<genre>\1</genre>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> @@ -55,7 +55,7 @@ <RegExp input="$$1" output="<director>\1</director>" dest="5+"> <expression>/director\.cfm\?directorid=281">([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/allocine.xml b/system/scrapers/video/allocine.xml index fdc6a70336..d6c96f8169 100644 --- a/system/scrapers/video/allocine.xml +++ b/system/scrapers/video/allocine.xml @@ -3,45 +3,38 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Activer les images HD et photos du film" type="bool" id="GetThumbnail" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp input="$$1" output="<setting label="Activer les Informations du film" type="bool" id="info" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp input="$$1" output="<setting label="Activer les Vignettes d'acteurs" type="bool" id="actor" default="falsetrue"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp input="$$1" output="<setting label="Activer les Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="http://www.allocine.fr/film/fichefilm_gen_cfilm=\1.html" dest="3"> <expression clear="yes" noclean="1">allocine\.fr/film/fichefilm_gen_cfilm=([0-9]*)\.html</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.allocine.fr/recherche/default.html?motcle=\1&rub=1&page=1" dest="3"> <expression>([^\(]+)</expression> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="2"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="2"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.allocine.fr/film/fichefilm_gen_cfilm=\1.html</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes"><h4><a href="/film/fichefilm_gen_cfilm=([0-9]+)\.html" class="link1">([^;#]*)</a</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails clearbuffers="no" dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!-- TITLE --> @@ -56,7 +49,6 @@ <RegExp conditional="info" input="$$1" output="\1" dest="7"> <expression noclean="1">Genre :([^:]*):</expression> </RegExp> - <RegExp conditional="info" input="$$6" output="<genre>\1</genre>" dest="5+"> <RegExp input="$$7" output=" / \1" dest="6"> <expression repeat="yes" noclean="1"><a href[^>]*>([^<]*)</a></expression> @@ -79,7 +71,6 @@ <RegExp conditional="info" input="$$1" output="\1#\2" dest="7"> <expression><h4>Note moyenne : <([^>]*)>[^0-9]*([0-9]*)</expression> </RegExp> - <RegExp conditional="info" input="$$7" output="<rating>\1.toile(s)</rating><votes>\2</votes>" dest="5+"> <expression>class="etoile_([0-9]*)"[^#]*#([0-9]*)</expression> </RegExp> @@ -111,40 +102,35 @@ <RegExp input="$$1" output="<fanart>\1</fanart>" dest="12+"> <expression>"([^"]*)" border="0" alt="" class="affichette</expression> </RegExp> - <RegExp conditional="fanart" input="$$1" output="<url cache="$$2-fanart.html"function="GetFanart">http://www.allocine.fr/film/galerievignette_gen_cfilm=\1.html</url>" dest="5+"> <expression>galerievignette_gen_cfilm=([0-9]*)</expression> </RegExp> <!-- THUMB --> <RegExp input="$$3" output="<url function="Getallocine" cache="$$2.html">\1</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <GetFanart dest="5"> <RegExp input="$$10$$12" output="<details><fanart>\1</fanart></details>" dest="5"> <RegExp input="$$1" output="\1/rsz/434/x/x/x/medias" dest="9+"> <expression>var CRP_PATH = "([^"]*)/crp/80/80/x/x/medias"</expression> </RegExp> - <RegExp input="$$1" output="<thumb>$$9\1</thumb>" dest="10+"> <expression repeat="yes" noclean="1">"fichier":"([^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetFanart> - <Getallocine dest="5"> <RegExp input="$$10$$11" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<thumb>http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/medias/nmedia/\1</thumb>" dest="11+"> <expression noclean="1"><img src="http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/medias/nmedia/([^"]+)" [^>]*></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </Getallocine> - <GetCredits clearbuffers="no" dest="5"> <RegExp input="$$3" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> @@ -156,49 +142,40 @@ </RegExp> <expression noclean="1"> / (.*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetCredits> - <GetActor clearbuffers="no" dest="5"> <RegExp input="$$3" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1"><b>Acteurs</b>(.*)<b>Production</b></expression> </RegExp> - <RegExp input="$$6" output="<actor><name>\3</name><role>\1</role></actor>" dest="3+"> <expression repeat="yes" noclean="1,2,3"><h5>([^<]*)</h5></td>[^<]*<[^>]*><h5><a href="/([^"]*)"[^>]*>([^<]*)<</expression> </RegExp> - <RegExp conditional="actor" input="$$6" output="<url function="GetActorThumb">http://www.allocine.fr/personne/fichepersonne_gen_cpersonne=\2.html</url><id>\2</id>\n" dest="3+"> <expression repeat="yes" noclean="1,2,3" ><h5>([^<]*)</h5></td>[^<]*<[^>]*><h5><a href="/personne/fichepersonne_gen_cpersonne=([0-9]*).html"[^>]*>([^<]*)<</expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetActor> - <GetActorThumb clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp conditional="actor" input="$$1" output="<thumb>\1</thumb>" dest="3"> <expression>src="([^"]*)" width="120" height="160" border="0"><br /></expression> </RegExp> - <RegExp conditional="actor" input="$$1" output="<name>\1</name>" dest="4"> <expression><title>([^<]*)</expression> </RegExp> - <RegExp conditional="actor" input="$$1" output="<actor>$$3$$4<role>test</role></actor>" dest="2+"> <expression>src="([^"]*)" width="120" height="160" border="0"><br /></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetActorThumb> - <GetTagline clearbuffers="no" dest="5"> <RegExp input="$$1" output="<details><tagline>\1</tagline></details>" dest="5+"> <expression clean="1" trim="1"><div align="justify" style="padding: 5 0 5 0"><h4>([^<]*)</expression> </RegExp> </GetTagline> </scraper> - diff --git a/system/scrapers/video/amazonuk.xml b/system/scrapers/video/amazonuk.xml index 0bf5626b7e..8fcb48db7e 100644 --- a/system/scrapers/video/amazonuk.xml +++ b/system/scrapers/video/amazonuk.xml @@ -6,7 +6,7 @@ <scraper framework="1.0" date="2009-05-22" content="movies" name="Amazon UK" thumb="amazonuk.png" language="en"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.amazon.co.uk/s/ref=nb_ss_d_h_?url=search-alias%3Ddvd&amp;field-keywords=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -14,7 +14,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>\1</url></entity>" dest="5"> <expression repeat="yes" clear="yes" noclean="1">productTitle"><a href="([^"]*)">([^<]*)</a></expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> @@ -22,15 +22,12 @@ <RegExp input="$$1" output="<title>\1</title>" dest="5"> <expression noclean="1" trim="1"><title>[Amazon.co.uk: ]*([^\:\(]*) </expression> </RegExp> - <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression trim="1">[ \[\(]([0-9]{4})[ \]\)][^<]*</span></expression> </RegExp> - <RegExp input="$$1" output="<top250>\1</top250>" dest="5+"> <expression>Top 250: #([0-9]*)</a></expression> </RegExp> - <RegExp input="$$9" output="<mpaa>Exempt</mpaa>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression><b>Classification:</b>.*(Exempt)</expression> @@ -91,11 +88,9 @@ </RegExp> <expression>(unrated)</expression> </RegExp> - <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> <expression><b>Classification:</b> ([^(]*) \(</expression> </RegExp> - <RegExp input="$$1" output="<certification>\1</certification>" dest="5+"> <expression repeat="yes">Classification:</b>[^>]*alt="([0-9]*)"</expression> </RegExp> @@ -117,7 +112,6 @@ <RegExp input="$$1" output="<outline>\2</outline><plot>\2</plot>" dest="5+"> <expression trim="1">Plot (Outline|Summary):</h5>([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression><b>Amazon.co.uk Review</b><br />\n ([^\n]*)</expression> </RegExp> @@ -127,28 +121,25 @@ <RegExp input="$$1" output="<thumb>\101.L.jpg</thumb>" dest="5+"> <expression noclean="1">"original_image", "([^"]*)AA2[0-9]0_\.jpg"</expression> </RegExp> - <RegExp input="$$9" output="<credits>\1</credits>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Writers:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - <RegExp input="$$9" output="<director>\1</director>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Directors:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - <RegExp input="$$9" output="<actor><name>\1</name></actor>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Actors:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/amazonus.xml b/system/scrapers/video/amazonus.xml index 5a7e3a44eb..4bc9932d3c 100644 --- a/system/scrapers/video/amazonus.xml +++ b/system/scrapers/video/amazonus.xml @@ -6,7 +6,7 @@ <scraper framework="1.0" date="2009-05-22" content="movies" name="Amazon US" thumb="amazonus.png" language="en"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.amazon.com/s/ref=nb_ss_d_h_?url=search-alias%3Ddvd&amp;field-keywords=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -14,7 +14,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>\1</url></entity>" dest="5"> <expression repeat="yes" clear="yes" noclean="1">productTitle"><a href="([^"]*)">([^<]*)</a></expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> @@ -28,7 +28,6 @@ <RegExp input="$$1" output="<top250>\1</top250>" dest="5+"> <expression>Top 250: #([0-9]*)</a></expression> </RegExp> - <RegExp input="$$9" output="<mpaa>G</mpaa>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression><b>Rating: </b>[^_]*/(g)._</expression> @@ -65,8 +64,6 @@ </RegExp> <expression>(unrated)</expression> </RegExp> - - <RegExp input="$$1" output="<certification>\1</certification>" dest="5+"> <expression repeat="yes">Classification:</b>[^>]*alt="([0-9]*)"</expression> </RegExp> @@ -94,32 +91,25 @@ <RegExp input="$$1" output="<thumb>\101.L.jpg</thumb>" dest="5+"> <expression noclean="1">"original_image", "([^"]*)AA2[0-9]0_\.jpg"</expression> </RegExp> - - <RegExp input="$$9" output="<credits>\1</credits>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Writers:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - - <RegExp input="$$9" output="<director>\1</director>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Directors:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - - <RegExp input="$$9" output="<actor><name>\1</name></actor>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1"><b>Actors:</b> ([^\n]*</a>)</expression> </RegExp> <expression noclean="1" repeat="yes">[^>]*>([^<]+)</a></expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/asiandb.xml b/system/scrapers/video/asiandb.xml index a717a2e02c..23da801013 100644 --- a/system/scrapers/video/asiandb.xml +++ b/system/scrapers/video/asiandb.xml @@ -6,27 +6,23 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url spoof="http://www.asiandb.com/browse/advanced.pfm" post="true">http://www.asiandb.com/browse/advanced.pfm?text=\1&amp;x=0&amp;y=0&amp;part=movie</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="3"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="3"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.asiandb.com/browse/movie_detail.pfm?code=\1</url><id>\1</id></entity>" dest="5"> <expression repeat="yes"><a href=/browse/movie_detail.pfm\?code=([0-9]+)><font class=e3b>(.[^<]*)</font></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <!--Title --> <RegExp input="$$1" output="<title>\1</title>" dest="5"> <expression trim="1" noclean="1"><td valign=top><font class=e5b>([^<]*)<</expression> </RegExp> - <!--Original Title <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5"> <expression>Titolo originale.[^z]*ze="2">([^)<]*)</expression> @@ -44,12 +40,10 @@ </RegExp> <expression repeat="yes"><b>Director: </b[^\n]*>([A-Za-z][^<]*)<</expression> </RegExp> - <!--Runtime Film--> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression><b>Runtime:</b>([^<]*)<</expression> </RegExp> - <!--Thumbnail --> <RegExp input="$$1" output="<thumb>http://www.asiandb.com\1</thumb>" dest="5+"> <expression noclean="1">(/data/title/mini/[^" ]*)</expression> @@ -59,12 +53,10 @@ <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> <expression>>Users</td>.*img src=/images/rate/[0-9]+.gif>\(([0-9]+)/10\)</expression> </RegExp> - <!--Vote count--> <RegExp input="$$1" output="<votes>\1</votes>" dest="5+"> <expression><font class=e2>&nbsp;\[([0-9]+)\]&nbsp;&nbsp;</font></expression> </RegExp> - <!--Genre Film--> <RegExp input="$$7" output="<genre>\1</genre>" dest="5+"> <RegExp input="$$1" output="\1" dest="7"> @@ -72,7 +64,6 @@ </RegExp> <expression repeat="yes">/browse/search.pfm\?mode=genre&query=[^>]*>([^<]*)<</expression> </RegExp> - <!--Actors --> <RegExp input="$$7" output="<actor><name>\1</name></actor>" dest="5+"> <RegExp input="$$1" output="\1" dest="7"> @@ -80,8 +71,6 @@ </RegExp> <expression repeat="yes">">([^<]+)</a></expression> </RegExp> - - <!--Writer--> <RegExp input="$$7" output="<credits>\1</credits>" dest="5+"> <RegExp input="$$1" output="\1" dest="7"> @@ -96,8 +85,7 @@ <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression trim="1">Introduction</td></table><div[^>]*><table[^>]*><td[^>]*><img[^>]*>(.*)</td></table></div><p></expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/cinefacts.xml b/system/scrapers/video/cinefacts.xml index 0af556e415..a7c6e3085c 100644 --- a/system/scrapers/video/cinefacts.xml +++ b/system/scrapers/video/cinefacts.xml @@ -4,9 +4,9 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> @@ -15,7 +15,6 @@ <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\3 (\4)</title><url cache="film.xml" >http://www.cinefacts.de/kino/\1/\2/filmdetails.html</url></entity>" dest="5"> @@ -24,19 +23,16 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><details>\1</details>" dest="3"> <!--Title--> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1" noclean="1"><h1>([^<]*)</expression> </RegExp> - <!--Original Title--> <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5+"> <expression><dt class="c1">Originaltitel:</dt>[^<]*<dd class="first">(.[^<]*)</dd></expression> </RegExp> - <!--Genre--> <RegExp input="$$1" output="\1" dest="4+"> <expression noclean="1">Genre:([^:]*)Deutschlandstart:</expression> @@ -52,7 +48,6 @@ <RegExp input="$$7" output="<director>\1</director>" dest="5+"> <expression repeat="yes" ><a href="[^"]*">([^<]*)</a></expression> </RegExp> - <!--Actors--> <RegExp input="$$1" output="\1" dest="7+"> <expression noclean="1">Darsteller:</td>(.*)</table</expression> @@ -60,32 +55,26 @@ <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role></actor>" dest="5+"> <expression repeat="yes">>([^<>]*)</a></td>+[^<]+<[^>]+> als([ A-Za-z]*)</expression> </RegExp> - <!--Studio--> <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> <expression>Studio:([^\.]*)\.</expression> </RegExp> - <!--Year--> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression></a> ([0-9]*) </dd></expression> </RegExp> - <!--MPAA--> <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> <expression>FSK:</dt>[^>]*>([^<]*)<</expression> </RegExp> - <!--Runtime--> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression>L.nge:</dt>[^>]*>([^<]*)<</expression> </RegExp> - <!--Plot--> <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression>KURZINHALT</h2></li>[^>]*>*([^<]*)[</li>]</expression> </RegExp> - <!--Writers--> <RegExp input="$$1" output="\1" dest="6+"> <expression noclean="1">Buch:([^:]*)Musik:</expression> @@ -93,12 +82,10 @@ <RegExp input="$$6" output="<credits>\1</credits>" dest="5+"> <expression repeat="yes" ><a href="[^"]*">([^<]*)</a></expression> </RegExp> - <!--Poster URL--> <RegExp input="$$1" output="<url function="GetThumbnailLink">http://www.cinefacts.de/kino/film/\1/\2/plakate.html</url>" dest="5+"> <expression repeat ="yes"><a href="/kino/film/([0-9]*)/([^\/]*)/plakate.html"></expression> </RegExp> - <!--IMDB URL--> <RegExp conditional="fanart" input="$$8" output="<url function="GetTMDBFanartByIMDBId">http://www.google.com/search?q=site:imdb.com\1</url>" dest="5+"> <RegExp input="$$1" output=""\2"+\1+||+"\2"" dest="7"> @@ -107,12 +94,11 @@ <RegExp input="$$7" output="+\1" dest="8+"> <expression repeat="yes">([^ ,]+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> <expression noclean="1"/> </RegExp> </GetDetails> - <!--Thumbnail--> <GetThumbnailLink dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5+"> @@ -122,7 +108,6 @@ <expression noclean="1"/> </RegExp> </GetThumbnailLink> - <GetThumbnail dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<thumb>http://www.cinefacts.de/kino/plakat/\1</thumb>" dest="2+"> diff --git a/system/scrapers/video/common/dtrailer.xml b/system/scrapers/video/common/dtrailer.xml index 98ded043dc..0a77fbdabf 100644 --- a/system/scrapers/video/common/dtrailer.xml +++ b/system/scrapers/video/common/dtrailer.xml @@ -4,12 +4,12 @@ <RegExp input="$$1" dest="5" output="<url function="GetDTrailer">http://en.dtrailer.com/movies/watch/\1</url>"> <expression><a href="http://en.dtrailer.com/movies/watch/(/?[^\>]+)" class="thumb" title="(/?[^\>]+)"></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDTrailerLink> <GetDTrailer dest="5"> <RegExp input="$$1" output="<details><trailer>http://www.dtrailer.com/dupload/trailerz/\1.flv</trailer></details>" dest="5"> - <expression noclean="1">s1\.addVariable\("file","(/?[^\>]+).flv"\);</expression> + <expression noclean="1">s1\.addVariable\("file","(/?[^\>]+).flv"\);</expression> </RegExp> </GetDTrailer> </scraperfunctions> diff --git a/system/scrapers/video/common/imdb.xml b/system/scrapers/video/common/imdb.xml index 235edc2460..0b4b341d5c 100644 --- a/system/scrapers/video/common/imdb.xml +++ b/system/scrapers/video/common/imdb.xml @@ -1,26 +1,26 @@ <scraperfunctions> <GetIMDBThumbs dest="5"> <RegExp input="$$6" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4"> - <expression noclean="1,2"><a name="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression> - </RegExp> - <RegExp input="$$4" output="<thumb>\1</thumb>" dest="6"> - <expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression> - </RegExp> - <expression noclean="1"></expression> + <RegExp input="$$1" output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4"> + <expression noclean="1,2"><a name="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression> + </RegExp> + <RegExp input="$$4" output="<thumb>\1</thumb>" dest="6"> + <expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression> + </RegExp> + <expression noclean="1"/> </RegExp> </GetIMDBThumbs> <GetIMDBTrailer dest="5"> - <RegExp input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> - <RegExp input="$$1" output="\1" dest="2"> - <expression noclean="1">"file"[^"]*"([^"]*)</expression> - </RegExp> - <RegExp input="$$1" output="$$2/\1" dest="2"> - <expression noclean="1">"id"[^"]*"([^"]*)</expression> - </RegExp> - <expression noclean="1"></expression> - </RegExp> - </GetIMDBTrailer> + <RegExp input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> + <RegExp input="$$1" output="\1" dest="2"> + <expression noclean="1">"file"[^"]*"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="$$2/\1" dest="2"> + <expression noclean="1">"id"[^"]*"([^"]*)</expression> + </RegExp> + <expression noclean="1"/> + </RegExp> + </GetIMDBTrailer> <GetIMDBWriters dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp conditional="!fullcredits" input="$$1" output="\1" dest="6"> @@ -32,7 +32,7 @@ <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> <expression repeat="yes"><a href="/name/[^>]*>([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBWriters> <GetIMDBCast dest="5"> @@ -46,7 +46,7 @@ <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> <expression clear="yes" repeat="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBCast> <GetIMDBDirectors dest="5"> @@ -60,7 +60,7 @@ <RegExp input="$$6" output="<director>\1</director>" dest="2+"> <expression clear="yes" repeat="yes"><a href="/name/[^>]*>([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBDirectors> <GetIMDBPlot dest="5"> @@ -68,7 +68,7 @@ <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> <expression clear="yes"><p class="plotpar">\n([^\n]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBPlot> </scraperfunctions> diff --git a/system/scrapers/video/common/movieposterdb.xml b/system/scrapers/video/common/movieposterdb.xml index 41386c495b..498258e090 100644 --- a/system/scrapers/video/common/movieposterdb.xml +++ b/system/scrapers/video/common/movieposterdb.xml @@ -1,9 +1,9 @@ <scraperfunctions> - <GetMoviePosterDBLink dest="6"> - <RegExp input="$$1" output="<details><url function="GetMoviePosterDBThumbs">\1</url></details>" dest="6"> + <GetMoviePosterDBLink dest="6"> + <RegExp input="$$1" output="<details><url function="GetMoviePosterDBThumbs">\1</url></details>" dest="6"> <expression>(http://www.movieposterdb.com/movie/[^"]*)"</expression> </RegExp> - </GetMoviePosterDBLink> + </GetMoviePosterDBLink> <GetMoviePosterDBThumbs dest="5"> <RegExp input="$$6" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<thumb>\1l_\2</thumb>" dest="6"> diff --git a/system/scrapers/video/common/tmdb.xml b/system/scrapers/video/common/tmdb.xml index 147807d25f..e3c859696e 100644 --- a/system/scrapers/video/common/tmdb.xml +++ b/system/scrapers/video/common/tmdb.xml @@ -1,29 +1,29 @@ <scraperfunctions> - <GetTMDBFanartByIMDBId dest="4"> + <GetTMDBFanartByIMDBId dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="<url function="GetTMDBFanart" cache="tmdb-\1.xml">http://api.themoviedb.org/2.0/Movie.getInfo?id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression><id>([0-9]*)</id></expression> </RegExp> - <RegExp input="$$1" output="<url function="GetTMDBFanartByIMDBId" cache="tmdb-trans-\1.xml" >http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="GetTMDBFanartByIMDBId" cache="tmdb-trans-\1.xml">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression>/title/([t0-9]*)</expression> </RegExp> <expression noclean="1"/> </RegExp> </GetTMDBFanartByIMDBId> - <GetTMDBFanart dest="5"> - <RegExp input="$$2" output="<details><fanart url="http://themoviedb.org/image/backdrops">\1</fanart></details>" dest="5"> + <GetTMDBFanart dest="5"> + <RegExp input="$$2" output="<details><fanart url="http://themoviedb.org/image/backdrops">\1</fanart></details>" dest="5"> <RegExp input="$$1" output="<thumb preview="/\1/\2_poster.\3">/\1/\2.\3</thumb>" dest="2"> <expression repeat="yes"><backdrop size="original">.*?/([0-9]+)/([^\.]+)\.([^<]*)</backdrop></expression> </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </GetTMDBFanart> + <expression noclean="1">(.+)</expression> + </RegExp> + </GetTMDBFanart> <GetTMDBThumbsByIMDBId dest="4">> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="<url function="GetTMDBThumbs" cache="tmdb-\1.xml">http://api.themoviedb.org/2.0/Movie.getInfo?id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression><id>([0-9]*)</id></expression> </RegExp> - <RegExp input="$$1" output="<url function="GetTMDBThumbsByIMDBId" cache="tmdb-trans-\1.xml">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="GetTMDBThumbsByIMDBId" cache="tmdb-trans-\1.xml">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression>/title/([t0-9]*)</expression> </RegExp> <expression noclean="1"/> diff --git a/system/scrapers/video/daum.xml b/system/scrapers/video/daum.xml index 2d074362aa..f84bed4084 100644 --- a/system/scrapers/video/daum.xml +++ b/system/scrapers/video/daum.xml @@ -3,15 +3,15 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="포스터" type="bool" id="EnableThumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="팬아트(고화질)" type="bool" id="EnableFanArt" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="극작가" type="bool" id="EnableWriter" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -110,7 +110,6 @@ <RegExp conditional="EnableThumbs" input="$$1" output="<url function="GetDaumPoster">\1</url>" dest="8+"> <expression><p class="poster"><a href="(.[^"]*)"</expression> </RegExp> - <!-- FanArts !--> <RegExp conditional="EnableFanArt" input="$$5" output="<url function="GetTMDBId">http://api.themoviedb.org/2.0/Movie.search?title=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="8+"> <RegExp input="$$1" output="\1" dest="7"> @@ -119,7 +118,7 @@ <RegExp input="$$7" output="+\1" dest="5"> <expression repeat="yes" clear="yes">([^ ,]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <!-- FanArts !--> <RegExp conditional="EnableFanArt" input="$$1" output="<url function="GetDAUMFanart">\1</url>" dest="8+"> @@ -132,7 +131,6 @@ <expression noclean="1"/> </RegExp> </GetDetails> - <GetDaumPoster dest="8"> <RegExp input="$$9" output="<details>\1</details>" dest="8"> <RegExp input="$$1" output="\1" dest="7"> @@ -144,31 +142,27 @@ <RegExp input="$$7" output="<thumb preview="http://movie.daum-img.net/movie/movie-photo/\1/\2/\3/155_225_\4">http://movie.daum-img.net/movie/movie-photo/\1/\2/\3/\4</thumb>" dest="9+"> <expression noclean="1" repeat="yes"><img src="http://movie.daum-img.net/movie/movie-photo/([0-9]*)/([0-9]*)/([0-9]*)/[0-9]*_[0-9]*_(.[^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDaumPoster> - <GetTMDBId dest="8"> <RegExp input="$$1" output="<details><url function="GetTMDBFanart">http://api.themoviedb.org/2.0/Movie.getInfo?id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url></details>" dest="8"> <expression><id>([0-9]*)</id></expression> </RegExp> </GetTMDBId> - <GetTMDBFanart clearbuffers="no" dest="8"> <RegExp input="$$1" output="<thumb preview="http://themoviedb.org/image/backdrops/\1/\2_poster.\3">http://themoviedb.org/image/backdrops/\1/\2.\3</thumb>" dest="10+"> <expression clear="yes" noclean="1" repeat="yes"><backdrop size="original">.*?/([0-9]+)/([^\.]+)\.([^<]*)</backdrop></expression> </RegExp> </GetTMDBFanart> - <GetDAUMFanart clearbuffers="no" dest="8"> <RegExp input="$$10$$11" output="<details><fanart>\1</fanart></details>" dest="8"> <RegExp input="$$1" output="<thumb preview="http://\1/C93x70/\2">http://\1/image/\2</thumb>" dest="11"> <expression clear="yes" noclean="1" repeat="yes">imgArray\.push\("http://(.[^/]*)/C93x70/(.[^"]*)"\)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDAUMFanart> - <GetWriter dest="8"> <RegExp input="$$1" output="\1" dest="7"> <expression noclean="1"><h5>각본</h5>(.*)<h5>촬영</h5></expression> @@ -177,7 +171,7 @@ <RegExp input="$$7" output="<credits>\1</credits>" dest="6"> <expression noclean="1" repeat="yes">class="em b">(.[^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetWriter> </scraper> diff --git a/system/scrapers/video/fdbpl.xml b/system/scrapers/video/fdbpl.xml index 547736237b..91a682500f 100644 --- a/system/scrapers/video/fdbpl.xml +++ b/system/scrapers/video/fdbpl.xml @@ -14,7 +14,7 @@ <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -31,13 +31,13 @@ <RegExp input="$$4" output="<entity><title>\2 (\3)</title><url>http://akas.imdb.com/title/\1/</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes" noclean="1,2">><a href="/title/([t0-9]*)/[^>]*>([^<]*)</a> *\(([0-9]*)</expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$2" output="<id>\1</id>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="5+"> <expression><b>([0-9.]+)/10</b>[^<]*<a href="ratings" class="tn15more">([0-9,]+) votes</a></expression> @@ -61,12 +61,12 @@ <expression>a href="/Sections/Years/([0-9]*)</expression> </RegExp> <RegExp input="$$2" output="<url function="Getfdblink">http://fdb.pl/katalog?catalog[query]=$$6&amp;catalog[year_from]=$$7&amp;catalog[order]=votes</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp input="$$2" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=$$2&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression></expression> + <RegExp input="$$2" output="<url function="GetTMDBFanartByIMDBId">$$2</url>" dest="5+"> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> <Getfdblink clearbuffers="no" dest="5"> @@ -78,15 +78,15 @@ <expression clear="yes" noclean="1,2">a href="([^>]+)">([^<]+)[^(]+\(([0-9]+)</expression> </RegExp> <RegExp input="$$6" output="<url function="GetDetailsfdb">$$6</url>" dest="2"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$6" output="<url function="GetPlotfdb">$$6/opisy</url>" dest="2+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$6" output="<url function="GetPosterfdb">$$6/plakaty</url>" dest="2+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </Getfdblink> <GetDetailsfdb dest="5"> @@ -136,7 +136,7 @@ <RegExp input="$$7" output="<actor><thumb>\1</thumb><name>\2</name><role>\3</role></actor>" dest="2+"> <expression repeat="yes" noclean="1" trim="2,3">src="([^"]+)/[^[A-Z]+([^<]+)</a></td>[^[A-Z]+([^<]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetailsfdb> <GetPlotfdb dest="5"> @@ -153,7 +153,7 @@ <RegExp input="$$7" output="\1" dest="2"> <expression noclean="1" repeat="yes">([^\n]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetPlotfdb> <GetPosterfdb dest="5"> @@ -164,7 +164,7 @@ <RegExp input="$$1" output="<thumb>\1</thumb>" dest="2+"> <expression noclean="1" repeat="yes">"gfx-poster-gallery" src="([^"]+)/</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetPosterfdb> </scraper> diff --git a/system/scrapers/video/filmaffinity.xml b/system/scrapers/video/filmaffinity.xml index 8896768105..5f57c6c492 100644 --- a/system/scrapers/video/filmaffinity.xml +++ b/system/scrapers/video/filmaffinity.xml @@ -7,45 +7,42 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Buscar fotos de actores en IMDB (muy lento)" type="bool" id="SearchCastThumb" default="true"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Habilitar trailers" type="bool" id="EnableTrailers" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Slo pster de FilmAffinity y sin FanArt (rpido)" type="bool" id="OnlyFilmAffinity" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Habilitar FanArt" type="bool" id="EnableFanArt" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Descargar psters de IMPAwards" type="bool" id="EnableIMPAwards" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Descargar psters de MoviePosterDB" type="bool" id="movieposterdb" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Descargar pster de IMDB" type="bool" id="EnableIMDBPosters" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Tamao del pster de IMDB" type="labelenum" values="192|256|384|512|1024" id="imdbscale" default="512"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp dest="3" input="$$1" output="<url>http://www.filmaffinity.com/es/film\1.html/</url>"> <expression noclean="1">filmaffinity.com/es/film([0-9]*)</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3" SearchStringEncoding="iso-8859-1"> <RegExp dest="3" input="$$1" output="<url>http://www.filmaffinity.com/es/search.php?stext=\1&amp;stype=none</url>"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="\1" dest="7"> @@ -60,10 +57,9 @@ <RegExp dest="5+" input="$$1" output="<entity><title>\2 (\3)</title><url>http://www.filmaffinity.com/es/film\1.html</url><id>\1</id></entity>"> <expression repeat="yes" noclean="1,2"><a href="/es/film([0-9]*).html[^>]*>([^<]*)</a>[^\(]*\(([0-9]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp dest="5" input="$$1" output="<title>\1</title>"> @@ -159,7 +155,6 @@ </RegExp> <expression repeat="yes"><td>([0-9]*) min\.</expression> </RegExp> - <RegExp input="$$20" output="\1" dest="5+"> <RegExp conditional="!SearchCastThumb" input="$$1" output="<actor><name>\1</name></actor>" dest="20+"> <expression repeat="yes" noclean="1" trim="1"><a href="search\.php.stype=cast[^>]*>([^<]*)</expression> @@ -170,21 +165,17 @@ <RegExp input="$$1" output="" dest="20"> <expression><a href="search\.php.stype=cast[^>]*>(Animation)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <RegExp conditional="EnableTrailers" input="$$1" output="<url function="SearchTrailerPage">http://www.filmaffinity.com/es/evideos.php\1</url>" dest="5+"> <expression noclean="1"><a href="/es/evideos.php([^"]+)</expression> </RegExp> - <RegExp input="$$1" output="<thumb>http://pics.filmaffinity.com/\1</thumb>" dest="5+"> <expression noclean="1,2">href="http://pics.filmaffinity.com/([^=]*large.jpg)"</expression> </RegExp> - <RegExp conditional="!OnlyFilmAffinity" input="$$1" output="<url function="GetFilmAffinityPosters">http://www.filmaffinity.com/es/filmimages.php?movie_id=\1</url>" dest="5+"> <expression noclean="1,2">href="/es/filmimages.php.movie_id=([^"]+)</expression> </RegExp> - <!--URL to Google and IMDB--> <RegExp conditional="!OnlyFilmAffinity" input="$$9" output="<url function="GoogleToIMDB">http://www.google.com/search?q=site:imdb.com\1</url>" dest="5+"> <RegExp input="$$8" output="+\1" dest="9"> @@ -202,17 +193,14 @@ </RegExp> <expression repeat="yes"><td >([0-9]*)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> - <RegExp input="$$1" output="<thumb>http://pics.filmaffinity.com/\1</thumb>" dest="5+"> <expression noclean="1,2">img src="http://pics.filmaffinity.com/([^=]*full.jpg)"</expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <SearchCastThumb dest="5"> <RegExp input="$$1" output="<details><actor><name>\1</name></actor></details>" dest="5"> <expression noclean="1,9" clear="yes">IMDb Name.*?"q" size="28" value="([^"]*)</expression> @@ -233,7 +221,6 @@ <expression noclean="1">Media of.nbsp;<a href="([^"]*)</expression> </RegExp> </SearchCastThumb> - <GetCastThumb dest="5"> <RegExp input="$$4" output="<details><actor>\1</actor></details>" dest="5"> <RegExp input="$$1" output="<name>\1</name>" dest="4"> @@ -248,40 +235,37 @@ <expression noclean="1" clear="yes">(.*)</expression> </RegExp> </GetCastThumb> - <SearchTrailerPage dest="5"> <RegExp input="$$1" output="<details><trailer>http://www.yobajo.com/watch?v=\1</trailer></details>" dest="5+"> <expression noclean="1">http://www.youtube.com/v/([^&|^\\]*)</expression> </RegExp> </SearchTrailerPage> - <GoogleToIMDB dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">/title/tt([0-9]*)</expression> </RegExp> - <RegExp conditional="EnableFanArt" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=tt$$6&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> - <expression></expression> + <RegExp conditional="EnableFanArt" output="<url function="GetTMDBFanartByIMDBId">tt$$6</url>" dest="5"> + <expression/> </RegExp> <RegExp conditional="EnableIMPAwards" output="<url function="GetIMPALink"cache="$$2.html">http://www.imdb.com/title/tt$$6/posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="movieposterdb" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=$$6</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="EnableIMDBPosters" output="<url function="GetIMDBPoster"cache="$$2.html">http://www.imdb.com/title/tt$$6/posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GoogleToIMDB> - <GetFilmAffinityPosters dest="5"> <RegExp input="$$10" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<thumb>http://pics.filmaffinity.com/\1</thumb>" dest="10"> <expression repeat="yes" noclean="1">url_l: 'http://pics.filmaffinity.com/([^']*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetFilmAffinityPosters> </scraper> diff --git a/system/scrapers/video/filmdelta.xml b/system/scrapers/video/filmdelta.xml index fdbcf31ff6..d3fc6c068e 100644 --- a/system/scrapers/video/filmdelta.xml +++ b/system/scrapers/video/filmdelta.xml @@ -9,7 +9,6 @@ <expression noclean="1"/> </RegExp> </GetSettings> - <CreateSearchUrl clearbuffers="no" dest="3"> <RegExp input="$$1" output="http://www.filmdelta.se/search.php?string=\1&type=movie&more=1" dest="3"> <RegExp input="$$1" output="\1" dest="9"> @@ -18,7 +17,6 @@ <expression trim="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><year>\3</year><url>http://www.filmdelta.se/filmer/\1</url></entity>" dest="5"> @@ -30,7 +28,6 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<title>\1</title>" dest="5"> diff --git a/system/scrapers/video/filmstarts.xml b/system/scrapers/video/filmstarts.xml index 676224405c..cc6f5fed7a 100644 --- a/system/scrapers/video/filmstarts.xml +++ b/system/scrapers/video/filmstarts.xml @@ -4,12 +4,11 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="<url>http://www.filmstarts.de/kritiken/\2.html</url>" dest="3"> <expression clear="yes" noclean="1">(filmstarts.de/kritiken/)(.*).html</expression> @@ -21,81 +20,66 @@ <expression>(imdb.com/title/tt)([0-9]*)</expression> </RegExp> </NfoUrl> - <GetByIMDBId dest="3"> <RegExp input="$$1" output="<url>http://www.filmstarts.de/kritiken/\1</url>" dest="3+"> <expression noclean="1"><a href="http://www.filmstarts.de/kritiken/([^"]*)"</expression> </RegExp> </GetByIMDBId> - <CreateSearchUrl dest="3" SearchStringEncoding="iso-8859-1"> <RegExp input="$$1" output="<url>http://www.filmstarts.de/finde.html?t=film&amp;anfrage=\1&amp;x=0&amp;y=0&</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="3"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="3"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.filmstarts.de/kritiken/\1</url>;</entity>" dest="5"> <expression repeat="yes"><li><a href="/kritiken/([^"]*)">.*?<span class="t">([^<]*)</span></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><details>\1</details>" dest="3"> - <!--Title --> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1" noclean="1"><title>([^<|^(]*)</expression> </RegExp> - <!--Original Title--> <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5+"> <expression>Originaltitel:(.*?)</div</expression> </RegExp> - <!--Year Film--> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression trim="1" noclean="1">genre".*weak".*[A-Z]([0-9 ]*) </div</expression> </RegExp> - <!--MPAA Film--> <RegExp input="$$1" output="<mpaa>ab \1</mpaa>" dest="5+"> <expression>FSK:.*?Ab ([0-9]*)<</expression> </RegExp> - <!--Director Film--> <RegExp input="$$1" output="<director>\1</director>" dest="5+"> <expression trim="1" noclean="1">Regie</span>.*?class="name">(.*?)</span</expression> </RegExp> - <!--Studio Film--> <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> <expression trim="1" noclean="1">Verleih:.*?">(.*?)</td</expression> </RegExp> - <!--Runtime Film--> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression trim="1" noclean="1">Laufzeit:</span>.*?">([A-Za-z0-9 ]*)</td</expression> </RegExp> - <!--User rating--> <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="5+"> <expression trim="1" noclean="1">"Wertung: ([0-9]*) / ([0-9]*)"</expression> </RegExp> - <!--Genre Film--> <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> <expression trim="1" noclean="1"><div class="genre"><a.*?">(.*?)</a</expression> </RegExp> - <!--Writer--> <RegExp input="$$1" output="<credits>\1</credits>" dest="5+"> <expression trim="1" noclean="1">Drehbuch</span>.*?class="name">([A-Za-z ]*)</span</expression> </RegExp> - <!--Plot--> <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression trim="1">"text critic topBorder">([^<]*)</div</expression> @@ -103,17 +87,14 @@ <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression trim="1">"text critic topBorder">.*?<br /><br />(.*?)</div></expression> </RegExp> - <!--Actors --> <RegExp input="$$1" output="<url function="GetActors">http://www.filmstarts.de/kritiken/\1/castcrew.html</url>" dest="5+"> <expression noclean="1">/kritiken/([-.%a-z0-9A-Z]+)/bilder.html</expression> </RegExp> - <!--Posters --> <RegExp input="$$1" output="<url function="GetPosters">http://www.filmstarts.de/kritiken/\1/bilder.html</url>" dest="5+"> <expression noclean="1">/kritiken/([-.%a-z0-9A-Z]+)/bilder.html</expression> </RegExp> - <!--URL to Google and Fanart--> <RegExp conditional="fanart" input="$$8" output="<url function="GetTMDBFanartByIMDBId">http://www.google.com/search?q=site:imdb.com\1</url>" dest="5+"> <RegExp input="$$1" output=""\1"+\3+||+"\2"" dest="7"> @@ -122,22 +103,20 @@ <RegExp input="$$7" output="+\1" dest="8+"> <expression repeat="yes">([^ ,]+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <!--Poster--> <GetPosters dest="5"> <RegExp input="$$2" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"><details>\1</details>" dest="5+"> <RegExp input="$$1" output="<thumb preview="http://thumbs.filmstarts.de/image/\1">http://thumbs.filmstarts.de/wallpaper/\1</thumb>" dest="2"> <expression repeat="yes">src="http://thumbs.filmstarts.de/mini/([^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetPosters> - <!--Actors--> <GetActors dest="5"> <RegExp input="$$2" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"><details>\1</details>" dest="5+"> @@ -153,7 +132,7 @@ <RegExp input="$$7" output="<actor><name>\1</name></actor>" dest="2+"> <expression repeat="yes" >class="name">([A-Za-z ]*)</span</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetActors> </scraper> diff --git a/system/scrapers/video/filmup.xml b/system/scrapers/video/filmup.xml index 3bb5fc9725..757a9de4c3 100644 --- a/system/scrapers/video/filmup.xml +++ b/system/scrapers/video/filmup.xml @@ -6,28 +6,24 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://filmup.leonardo.it/cgi-bin/search.cgi?ps=10&fmt=long&q=\1&ul=%25%2Fsc_%25&m=all&wf=222210&o=0&ps=50" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://filmup.leonardo.it/sc_\1.htm</url><id>\1</id></entity>" dest="5"> <expression repeat="yes"><a class="filmup" href="http.[^sc_]*sc_([0-9a-z_]*)\.htm"[^>]*>[^:]*: (.[^\n]*[^>]*)></expression> - </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <!--Title --> <RegExp input="$$1" output="<title>\1</title>" dest="5"> <expression trim="1" noclean="1"><title>FilmUP - Scheda: ([^<]*)<</expression> </RegExp> - <!--Original Title <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5"> <expression>Titolo originale.[^z]*ze="2">([^)<]*)</expression> @@ -37,19 +33,16 @@ <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression>Anno.[^z]*ze="2">([0-9]*)<</expression> </RegExp> - <!--Director--> <RegExp input="$$1" output="<director>\1</director>" dest="5+"> <expression>Regia.[^z]*ze="2">([^\n]*)</font></expression> </RegExp> - <!--Runtime Film--> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression>Durata.[^z]*ze="2">([^)<]*)</expression> </RegExp> - <!--Genre Film--> <RegExp input="$$6" output="<genre>\1</genre>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> @@ -76,10 +69,8 @@ <expression repeat="yes">([a-zA-Z][^,]*)</expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> - diff --git a/system/scrapers/video/filmweb.xml b/system/scrapers/video/filmweb.xml index 0e02bbbb17..d84495174e 100644 --- a/system/scrapers/video/filmweb.xml +++ b/system/scrapers/video/filmweb.xml @@ -4,12 +4,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Wysoka jakosc okladki" type="bool" id="poster" default="false"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Pelna obsada" type="bool" id="fullcredits" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -25,7 +25,7 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.filmweb.pl/szukaj/film?sort=COUNT&q=\1" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -42,7 +42,7 @@ <RegExp input="$$7" output="<entity><title>(\1) \2</title><url>http://www.filmweb.pl/Film?id=\3</url></entity>" dest="5+"> <expression repeat="yes">([0-9]+)#([^#]+)#([0-9]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> @@ -111,21 +111,21 @@ <expression repeat="yes" trim="1,2">src="http://gfx.filmweb.pl/p/([^\.]+)[^>]+[^[a-zA-Z]+([^\n]+)</expression> </RegExp> <RegExp input="$$9" output="<url function="FilmwebToWikipedia">http://pl.wikipedia.org/w/index.php?title=Specjalna%3ALinksearch&amp;target=http://www.filmweb.pl/Film?id=$$9</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$1" output="<url function="Obsada" >http://\1.filmweb.pl/f\2/xbmc,2008/obsada</url>" dest="5+"> <expression>http://([^\/]+).filmweb.pl/f([0-9]*)/[^>]+">pełna obsada</a></expression> </RegExp> <RegExp input="$$9" output="<url function="Zwiastuny" >http://www.filmweb.pl/f$$9/xbmc,2008/zwiastuny</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$9" output="<url function="Opisy">http://www.filmweb.pl/f$$9/xbmc,2008/opisy</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="poster" input="$$9" output="<url function="Plakaty">http://www.filmweb.pl/f$$9/xbmc,2008/plakaty</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> <FilmwebToWikipedia clearbuffers="no" dest="5"> @@ -139,7 +139,7 @@ </RegExp> <expression>_(.*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </FilmwebToWikipedia> <Opisy dest="5"> @@ -164,7 +164,7 @@ <RegExp input="$$1" output="<thumb>http://gfx.filmweb.pl/po\1</thumb>" dest="8+"> <expression noclean="1" repeat="yes">href="http://gfx.filmweb.pl/po(.[^"]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </Plakaty> <Obsada dest="5"> @@ -178,7 +178,7 @@ <RegExp input="$$9" output="<actor><thumb>http://gfx.filmweb.pl/p/\1.1.jpg</thumb><name>\2</name></actor>" dest="8+"> <expression repeat="yes" trim="1,2">src="http://gfx.filmweb.pl/p/([^\.]+)[^>]+[^[a-zA-Z]+([^\n]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </Obsada> <Zwiastuny dest="5"> diff --git a/system/scrapers/video/imdb tv.xml b/system/scrapers/video/imdb tv.xml index 78f6276cd2..5a7c432b79 100644 --- a/system/scrapers/video/imdb tv.xml +++ b/system/scrapers/video/imdb tv.xml @@ -6,24 +6,24 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Full Cast Credits" type="bool" id="fullcredits" default="false"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable IMPAwards" type="bool" id="impawards" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable MoviePosterDB" type="bool" id="movieposterdb" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="IMDB Poster &amp; Actor Thumb(s) Size" type="labelenum" values="192|256|384|512|1024" id="imdbscale" default="192"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Input Alternative IMDb Source" type="text" id="url" default="akas.imdb.com"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -36,7 +36,7 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://$INFO[url]/find?s=tt;q=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -53,7 +53,7 @@ <RegExp input="$$4" output="<entity><title>\2 (\3)</title><url>http://$INFO[url]/title/\1/</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes" noclean="1,2">><a href="/title/([t0-9]*)/[^>]*>([^<]*)</a> *\(([0-9]*)</expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> <GetDetails clearbuffers="no" dest="3"> @@ -71,30 +71,30 @@ <expression repeat="yes">"/Sections/Genres/[^/]*/">([^<]*)</a></expression> </RegExp> <RegExp input="$$2" output="<url function="GetSeriesPremiered">http://$INFO[url]/title/\1/episodes</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$2" output="<url function="GetSeriesPlot">http://$INFO[url]/title/\1/plotsummary</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetSeriesCast">http://$INFO[url]/title/\1/</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetSeriesCast">http://$INFO[url]/title/\1/fullcredits#cast</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="impawards" input="$$2" output="<url cache="$$2-posters.html" function="GetIMPALink">http://$INFO[url]/title/\1/posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=\1</url>" dest="5+"> <expression>/title/tt([t0-9]*)/faq</expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-posters.html" function="GetIMDBThumbs">http://$INFO[url]/title/\1/posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$2" output="<episodeguide><url>http://www.imdb.com/title/\1/episodes</url></episodeguide>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> <GetSeriesPremiered clearbuffers="no" dest="5"> @@ -107,7 +107,7 @@ <RegExp input="$$1" output="\1" dest="2"> <expression><p class="plotpar">\n([^\n]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSeriesPlot> <GetSeriesCast clearbuffers="no" dest="5"> @@ -121,7 +121,7 @@ <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> <expression repeat="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SY[0-9]+_)</thumb>(.*?)</actor></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSeriesCast> <GetEpisodeList dest="9"> @@ -129,7 +129,7 @@ <RegExp input="$$1" output="<episode><title>\4</title><url>http://$INFO[url]/title/\3/</url><epnum>\2</epnum><season>\1</season><id>\3</id></episode>" dest="4"> <expression repeat="yes"><a name="year-[0-9]+"> </a><h4>Season ([0-9]*), Episode ([0-9]*): <a href="/title/([^"]*)/">([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeList> <GetEpisodeDetails dest="9"> @@ -171,18 +171,18 @@ <expression noclean="1">first billed only: </b></td></tr>(.*)</expression> </RegExp> <RegExp input="$$2" output="<url function="GetEpisodePlot">http://$INFO[url]/title/\1/plotsummary</url>" dest="4+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="!fullcredits" input="$$2" output="<url function="GetEpisodeCast">http://$INFO[url]/title/\1/</url>" dest="4+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$2" output="<url function="GetEpisodeCast">http://$INFO[url]/title/\1/fullcredits#cast</url>" dest="4+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<url function="GetEpisodeRuntime">http://$INFO[url]/title/\1</url>" dest="4+"> <expression><h5>TV Series:</h5>[^<]*<a href="/title/([^/]*)/"></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeDetails> <GetEpisodePlot dest="4"> @@ -190,7 +190,7 @@ <RegExp input="$$1" output="\1" dest="2"> <expression><p class="plotpar">\n([^\n]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodePlot> <GetEpisodeCast dest="4"> @@ -204,7 +204,7 @@ <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> <expression repeat="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SY[0-9]+_)</thumb>(.*?)</actor></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeCast> <GetEpisodeRuntime dest="4"> @@ -212,7 +212,7 @@ <RegExp input="$$1" output="\1" dest="2"> <expression trim="1"><h5>Runtime:</h5>([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeRuntime> </scraper> diff --git a/system/scrapers/video/imdb-cn.xml b/system/scrapers/video/imdb-cn.xml index d47790d824..1823d86c53 100644 --- a/system/scrapers/video/imdb-cn.xml +++ b/system/scrapers/video/imdb-cn.xml @@ -5,12 +5,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable MoviePosterDB" type="bool" id="movieposterdb" default="false"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -26,7 +26,7 @@ </NfoUrl> <CreateSearchUrl dest="3" SearchStringEncoding="gb2312"> <RegExp input="$$1" output="<url>http://www.imdb.cn/searchh.php?keyword=\1&amp;a=search&amp;Type=movie</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -49,7 +49,7 @@ <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$2" output="<id>\1</id>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1" noclean="1"><title>([^<|^-]*)</expression> @@ -88,7 +88,7 @@ <expression><div id=imdbjqbody><h2>[^<]*</h2><br>(.*?)</div</expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-fullcredits.html" function="GetFullcredits">$$3/fulldredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=\1</url>" dest="5+"> <expression>/title/tt([0-9]*)/ratings</expression> @@ -96,13 +96,12 @@ <RegExp input="$$1" output="<url function="GetIMDBCNPoster">\1</url>" dest="5+"> <expression><a href=(http://posters.imdb.cn/poster/[0-9]*)</expression> </RegExp> - <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=$$2&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression></expression> + <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">$$2</url>" dest="5+"> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <GetFullcredits clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> @@ -123,7 +122,7 @@ <RegExp input="$$8" output="<credits>\1</credits>" dest="2+"> <expression repeat="yes">href='/name/nm[0-9]+'>([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetFullcredits> <GetIMDBCNPoster dest="5"> @@ -131,7 +130,7 @@ <RegExp input="$$1" output="<thumb>\1</thumb>" dest="6"> <expression clear="yes" noclean="1"><img src="(.*?/poster-pic/.*?.jpg)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBCNPoster> </scraper> diff --git a/system/scrapers/video/imdb.xml b/system/scrapers/video/imdb.xml index 90ec2b6ce9..ef94b1cb9d 100644 --- a/system/scrapers/video/imdb.xml +++ b/system/scrapers/video/imdb.xml @@ -8,36 +8,36 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Full Cast Credits" type="bool" id="fullcredits" default="false"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable themoviedb.org" type="bool" id="tmdbthumbs" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable IMPAwards" type="bool" id="impawards" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable MoviePosterDB" type="bool" id="movieposterdb" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable IMDB Trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable DTrailer.com Trailer" type="bool" id="dtrailer" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="IMDB Poster &amp; Actor Thumb(s) Size" type="labelenum" values="192|256|384|512|1024" id="imdbscale" default="512"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Input Alternative IMDb Source" type="text" id="url" default="akas.imdb.com"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -53,7 +53,7 @@ <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -70,13 +70,13 @@ <RegExp input="$$4" output="<entity><title>\2</title><year>\3</year><url>http://$INFO[url]/title/\1/</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes" noclean="1,2">><a href="/title/([t0-9]*)/[^>]*>([^<]*)</a> *\(([0-9]*)</expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$2" output="<id>\1</id>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1" noclean="1"><title>([^<|^(]*)</expression> @@ -112,31 +112,31 @@ <expression>Plot:</h5>(.*?) \| <a class="tn15more</expression> </RegExp> <RegExp input="$$2" output="<url function="GetIMDBPlot">$$3plotsummary</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetIMDBCast">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetIMDBDirectors">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetIMDBWriters">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBCast">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBDirectors">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBWriters">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp conditional="tmdbthumbs" input="$$2" output="<url function="GetTMDBThumbsByIMDBId" cache="tmdb-trans-\1.xml">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> + <RegExp conditional="tmdbthumbs" input="$$2" output="<url function="GetTMDBThumbsByIMDBId">$$3</url>" dest="5+"> <expression/> </RegExp> <RegExp conditional="impawards" input="$$2" output="<url cache="$$2-posters.html" function="GetIMPALink">$$3posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=\1</url>" dest="5+"> <expression>/title/tt([t0-9]*)/faq</expression> @@ -148,12 +148,12 @@ <expression trim="1" noclean="1"><title>([^<|^(]*)</expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-posters.html" function="GetIMDBThumbs">$$3posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=$$2&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression></expression> + <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">$$3</url>" dest="5+"> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/jadedVideo.xml b/system/scrapers/video/jadedVideo.xml index e3b6efb7c2..11a593f6ee 100644 --- a/system/scrapers/video/jadedVideo.xml +++ b/system/scrapers/video/jadedVideo.xml @@ -6,21 +6,17 @@ </NfoUrl> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://jadedvideo.com/Search?q=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - </CreateSearchUrl> - <GetSearchResults dest="6"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="6"> <RegExp input="$$1" output="<entity><title>\3</title><url>http://jadedvideo.com/\1</url></entity>" dest="5+"> <expression repeat="yes">"jadedcatprodtitle"><a href="http://jadedvideo\.com/([^"]*)"><em>([^>]*)</em> ([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<thumb>http://jadedvideo.com/images/CoverFront/320x480/\1.jpg</thumb>" dest="5"> @@ -41,7 +37,7 @@ <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> <expression>Studio</strong>: <[^>]*>([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/moviemaze.xml b/system/scrapers/video/moviemaze.xml index 3c786ba1ae..4335c5e4d5 100644 --- a/system/scrapers/video/moviemaze.xml +++ b/system/scrapers/video/moviemaze.xml @@ -4,15 +4,14 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="<url>\1\2/\3.html</url>" dest="3"> <expression clear="yes" noclean="1">(http://www.moviemaze.de/filme/)([0-9]*)/(.*).html</expression> @@ -24,19 +23,16 @@ <expression>(imdb.com/title/tt)([0-9]*)</expression> </RegExp> </NfoUrl> - <GetByIMDBId dest="3"> <RegExp input="$$1" output="<url>http://www.moviemaze.de/filme/\1/\2</url><id>\1</id>" dest="3+"> <expression noclean="1"><a href="http://www.moviemaze.de/filme/([0-9]*)/([^"]*)</expression> </RegExp> </GetByIMDBId> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.moviemaze.de/suche/result.phtml?searchword=\1" dest="3"> <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\3</title><url>http://www.moviemaze.de/filme/\1/\2</url></entity>" dest="5+"> @@ -45,7 +41,6 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!--Title--> @@ -100,7 +95,7 @@ <RegExp input="$$7" output="+\1" dest="8+"> <expression repeat="yes">([^ ,]+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> <!--User rating--> <RegExp input="$$1" output="<rating>\1</rating><votes>100</votes>" dest="5+"> @@ -140,17 +135,16 @@ </RegExp> <expression repeat="yes">(<a href\="[^>]*>)?(.*?)(</a>)?( \((.*?)\))?, </expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <!--Thumbnail--> <GetThumbnailLink dest="5"> <RegExp input="$$2" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"><details>\1</details>" dest="5+"> <RegExp input="$$1" output="<thumb>http://www.moviemaze.de/filme/\1/poster_lg\2.jpg</thumb>" dest="2"> <expression repeat="yes">/([0-9]+)/poster([0-9]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetThumbnailLink> <!--Trailer--> @@ -168,7 +162,7 @@ <RegExp input="$$1" output="<trailer urlencoded="yes">http://www.moviemaze.de/media/trailer/delivery/\1.mov</trailer>" dest="2+"> <expression>delivery/([0-9]+/[a-z0-9]+/[0-9]+_trailer[0-9]+-de_320).mov</expression> </RegExp> - <expression clear="yes" noclean="1"></expression> + <expression clear="yes" noclean="1"/> </RegExp> </GetTrailerLink> </scraper> diff --git a/system/scrapers/video/mtime.xml b/system/scrapers/video/mtime.xml index fa3e8dfa11..36d7943aad 100644 --- a/system/scrapers/video/mtime.xml +++ b/system/scrapers/video/mtime.xml @@ -3,9 +3,9 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -15,7 +15,7 @@ </NfoUrl> <CreateSearchUrl dest="3" SearchStringEncoding="gb2312"> <RegExp input="$$1" output="<url>http://www.mtime.com/search/movie?\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -29,7 +29,7 @@ <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$2" output="<id>\1</id>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1" noclean="1"><a href="/movie/[0-9]*/" class="px28 bold hei c_000">([^<]*)</a></expression> @@ -38,13 +38,13 @@ <expression>href="/movie/section/year/([0-9]*)/"</expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-details.html" function="GetDetailsPage">$$3details.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression trim="1">片长：</strong>([^<]*)<</expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-rating.html" function="GetRating">$$3rating/summary.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> <expression repeat="yes">href="/movie/section/genre/[^>]*>([^<]*).nbsp</expression> @@ -53,21 +53,20 @@ <expression><!-- 剧情介绍 -->.*?<p >(.*?)\t</p></expression> </RegExp> <RegExp input="$$2" output="<url cache="$$2-fullcredits.html" function="GetFullcredits">$$3fullcredits.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$2" output="<url cache="$$2-posters.html" function="GetMtimePoster">$$3posters_and_images/posters.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fanart" input="$$2" output="<url cache="$$2-fanart.html" function="GetMtimeWallpapers">$$3posters_and_images/wallpapers.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="fanart" input="$$2" output="<url cache="$$2-fanart.html" function="GetMtimeFanart">$$3posters_and_images/stills.html</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <GetDetailsPage clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="2"> @@ -76,7 +75,7 @@ <RegExp input="$$1" output="<certification>\1</certification>" dest="2+"> <expression repeat="yes">href="/movie/section/certification/[^"]*">([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetailsPage> <GetRating clearbuffers="no" dest="5"> @@ -84,7 +83,7 @@ <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="2"> <expression clear="yes">全部会员.*?class="score">([0-9.]+)</span>.*?class="vote">([0-9]+)</span></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetRating> <GetFullcredits clearbuffers="no" dest="5"> @@ -107,7 +106,7 @@ <RegExp input="$$9" output="<credits>\1</credits>" dest="2+"> <expression repeat="no"><a href="/person/[0-9]+/">([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetFullcredits> <GetMtimePoster dest="5"> @@ -115,7 +114,7 @@ <RegExp input="$$1" output="<thumb>\1.jpg</thumb>" dest="6"> <expression clear="yes" repeat="yes" noclean="1">src="(http://img1.mtime.com/[^_]*)_[0-9X]+.jpg"/></a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMtimePoster> <GetMtimeWallpapers clearbuffers="no" dest="6"> @@ -128,7 +127,7 @@ <RegExp input="$$1" output="<thumb preview="\1.jpg">\1_o.jpg</thumb>" dest="11"> <expression clear="yes" repeat="yes" noclean="1">src="http://img1.mtime.com/([^_]*)(_[0-9X]+).jpg"/></a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetMtimeFanart> </scraper> diff --git a/system/scrapers/video/mtv.xml b/system/scrapers/video/mtv.xml index 5d85b9de5c..b1850369da 100644 --- a/system/scrapers/video/mtv.xml +++ b/system/scrapers/video/mtv.xml @@ -2,7 +2,7 @@ <scraper framework="1.0" date="2009-05-22" name="MTV" content="musicvideos" thumb="mtv.png" language="en"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://api.mtvnservices.com/1/video/search/?term=\1</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -10,7 +10,7 @@ <RegExp input="$$1" output="<entity><title>\1 - \2</title><url>\4</url></entity>" dest="5"> <expression noclean="1" repeat="yes"><entry>.*?<content>(.*?) \| (.*?) \| (.*?)</content>.*?media:player url="([^"]*)"/></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="3"> @@ -36,7 +36,7 @@ <RegExp input="$$1" output="<thumb>http://www.mtv.com\2.jpg</thumb>" dest="5+"> <expression noclean="1">"thumbnail"([^"]*)content="([^"]*)\.jpg</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/mymoviesdk.xml b/system/scrapers/video/mymoviesdk.xml index 1d0fe2ab29..142e2db1dc 100644 --- a/system/scrapers/video/mymoviesdk.xml +++ b/system/scrapers/video/mymoviesdk.xml @@ -4,54 +4,52 @@ <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <!--Username--> <RegExp input="$$1" output="<setting label="Username" type="text" id="username" default=""></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--Password--> <RegExp input="$$1" output="<setting label="Password" type="text" option="hidden" id="password" default=""></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--- --> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--Fanart--> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--Trailer--> <RegExp input="$$1" output="<setting label="Preferred trailer bitrate" type="labelenum" values="2048|1024|512|256|128" id="trailerbitrate" default="2048"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--Preferred language--> <RegExp input="$$1" output="<setting label="Preferred language" type="labelenum" values="Arabic|Bulgarian|Cantonese|Mandarin|Czech|Croatian|Danish|Dutch|English|Estonian|Faroese|Farsi|Finnish|Flemish|French|German|Greek|Hebrew|Hindi|Hungarian|Icelandic|Indonesian|Italian|Japanese|Korean|Lithuanian|Norwegian|Polish|Portuguese|Romanian|Russian|Serbian|Slovakian|Slovene|Spanish|Swedish|Tagalog|Thai|Turkish|Malay|Latvian|Ukrainian|Tamil|Catalan|Telugu|Malayalam|Kannada|Bengali|Serbo-Croatian|Gujarati|Esperanto|Vietnamese|Kazakh|Ancient Greek|Mandar|Braj|Macedonian|Zulu|Twi|Volapük|Albanian|Khmer|Basque" id="language" default="English"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!--Include adult movies--> <RegExp input="$$1" output="<setting label="Include adult movies" type="bool" id="includeadult" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>https://api.mymovies.dk/Default.aspx?command=SearchMovieByTitle&amp;title=\1&amp;username=$INFO[username]&amp;password=$INFO[password]&amp;PrimaryLanguage=$INFO[language]&amp;includeadult=$INFO[includeadult]&amp;locale=1033</url>" dest="3"> <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$3" output="<results sorted="Yes">\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><year>\3</year><id>\1</id><url>https://api.mymovies.dk/Default.aspx?command=LoadMovieById&amp;titleid=\1&amp;username=$INFO[username]&amp;password=$INFO[password]&amp;PrimaryLanguage=$INFO[language]&amp;maxtrailerbitrate=$INFO[trailerbitrate]&amp;locale=1033&amp;client=xbmcbased</url></entity>" dest="3"> <expression repeat="yes">id="(.*?)".*? title="(.*?)"[^<]*year="(.*?)" thumb</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp input="$$4" output="<error>\1</error>" dest="8"> <RegExp input="$$1" output="<title>Error returned from MyMovies.dk</title><message>\1</message>" dest="4"> @@ -60,7 +58,6 @@ <expression noclean="1">(.+)</expression> </RegExp> </GetSearchResults> - <NfoUrl dest="3"> <RegExp input="$$1" output="<url>https://api.mymovies.dk/Default.aspx?command=LoadMovieByIMDBId&imdbid=tt\2&username=$INFO[username]&password=$INFO[password]&PrimaryLanguage=$INFO[language]&includeadult=$INFO[includeadult]&maxtrailerbitrate=$INFO[trailerbitrate]&locale=1033</url>" dest="3"> <expression>(imdb.com/title/tt)([0-9]*)</expression> @@ -69,7 +66,6 @@ <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> </NfoUrl> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!--Title--> @@ -182,7 +178,7 @@ <RegExp input="$$1" output="<trailer>\1</trailer>" dest="5+"> <expression><Trailer[^>]*>([^<]*)</Trailer></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> diff --git a/system/scrapers/video/naver.xml b/system/scrapers/video/naver.xml index 9a54e7afd3..78e6950be9 100644 --- a/system/scrapers/video/naver.xml +++ b/system/scrapers/video/naver.xml @@ -4,18 +4,18 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="ֿ//ۻ翡 " type="bool" id="EnableDetail" default="true"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="" type="bool" id="EnableThumbs" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label=" ǥڼ" type="bool" id="EnableVoteNum" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="ҾƮ(ȭ)" type="bool" id="EnableFanArt" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <NfoUrl dest="3"> @@ -114,7 +114,7 @@ <RegExp input="$$7" output="+\1" dest="5"> <expression repeat="yes">([^ ,]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <!-- FanArts !--> <RegExp conditional="EnableFanArt" input="$$1" output="<url function="GetNAVERFanart">http://movie.naver.com/movie/bi/mi/photo.nhn?code=\1</url>" dest="8+"> @@ -131,7 +131,7 @@ <RegExp input="$$7" output="<thumb preview="http://imgmovie.naver.com/mdi/mit120/\1">http://imgmovie.naver.com/mdi/mit500/\1</thumb>" dest="9"> <expression noclean="1" repeat="yes">"><img src="http://imgmovie.naver.com/mdi/mit120/(.[^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetNAVERPhoto> <GetNAVERVote dest="8"> @@ -139,7 +139,7 @@ <RegExp input="$$1" output="<votes>\1</votes>" dest="9"> <expression noclean="1" trim="1"><p class="join">[^>]*>(.[^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetNAVERVote> <GetNAVERDetail dest="8"> @@ -162,7 +162,7 @@ <RegExp input="$$6" output="<credits>\1</credits>" dest="9+"> <expression noclean="1" repeat="yes"><a href="/movie/bi/pi/basic.nhn\?code=[0-9]*">(.[^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetNAVERDetail> <GetNAVERFanart clearbuffers="no" dest="8"> @@ -173,8 +173,7 @@ <RegExp input="$$7" output="<thumb preview="http://imgmovie.naver.com/mdi/mit120/\1">http://imgmovie.naver.com/mdi/mi/\1</thumb>" dest="11"> <expression noclean="1" repeat="yes" clear="yes">"><img src="http://imgmovie.naver.com/mdi/mit120/(.[^"]*)"</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetNAVERFanart> </scraper> - diff --git a/system/scrapers/video/ofdb.xml b/system/scrapers/video/ofdb.xml index 96da60f805..7a3a7c02e8 100644 --- a/system/scrapers/video/ofdb.xml +++ b/system/scrapers/video/ofdb.xml @@ -5,21 +5,20 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="MoviePosterDB" type="bool" id="movieposterdb" default="false"></setting>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$1" output="<setting label="Trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> - <expression></expression> - </RegExp> + <RegExp input="$$1" output="<setting label="Trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> + <expression/> + </RegExp> <RegExp input="$$1" output="<setting label="Groesse der Darsteller Bilder" type="labelenum" values="192|256|384|512|1024" id="imdbscale" default="512"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="<url>\1\2,\3</url>" dest="3"> <expression clear="yes" noclean="1">(http://www.ofdb.de/film/)([0-9]*),(.*)</expression> @@ -28,53 +27,46 @@ <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> <RegExp input="$$1" output="<url function="GetByIMDBId">http://www.ofdb.de/view.php?SText=\2&amp;Kat=IMDb&amp;page=suchergebnis&amp;sourceid=mozilla-search</url>" dest="3+"> - <expression>(imdb.com/title/tt)([0-9]*)</expression> - </RegExp> + <expression>(imdb.com/title/tt)([0-9]*)</expression> + </RegExp> </NfoUrl> - <GetByIMDBId dest="3"> <RegExp input="$$1" output="<url>http://www.ofdb.de/film/\1,</url><id>\1</id>" dest="3+"> <expression repeat="yes" noclean="1">"film/([0-9]*),</expression> </RegExp> </GetByIMDBId> - - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://www.ofdb.de/view.php?SText=\1&Kat=Titel&page=suchergebnis&sourceid=mozilla-search" dest="3"> <expression noclean="1">([^\(]+)</expression> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2 (\4) | \3</title><year>\4</year><url cache="\1.html">http://www.ofdb.de/film/\1,</url><id>\1</id></entity>" dest="5+"> <expression repeat="yes" noclean="1"><a href=.[^0-9]+([0-9]+)[^ ]+ onmouseover=.Tip..<[^>]+>[^>]+>([^<]+)<font size=.1.> . ([^<]+)</font> \(([0-9]+)\)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - - <GetDetails dest="3"> - <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="3"> - <!--Title --> - <RegExp input="$$6" output="\1" dest="5+"> - <RegExp input="$$1" output="<title>\1</title>" dest="6"> - <expression trim="1"><td width="99."><h2><font face="Arial,Helvetica,sans-serif" size="3"><b>([^<]+)</b></font></h2></td></expression> - </RegExp> - <RegExp input="$$7" output="<title>\2 \1</title>" dest="6"> - <RegExp input="$$1" output="\1" dest="7"> + <GetDetails dest="3"> + <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="3"> + <!--Title --> + <RegExp input="$$6" output="\1" dest="5+"> + <RegExp input="$$1" output="<title>\1</title>" dest="6"> + <expression trim="1"><td width="99."><h2><font face="Arial,Helvetica,sans-serif" size="3"><b>([^<]+)</b></font></h2></td></expression> + </RegExp> + <RegExp input="$$7" output="<title>\2 \1</title>" dest="6"> + <RegExp input="$$1" output="\1" dest="7"> <expression trim="1"><td width="99."><h2><font face="Arial,Helvetica,sans-serif" size="3"><b>([^<]+)</b></font></h2></td></expression> </RegExp> <expression>(.*), (Die|Der|Das|The)</expression> - </RegExp> - <expression noclean="1"></expression> - </RegExp> - + </RegExp> + <expression noclean="1"/> + </RegExp> <!--Original Title --> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">class="Normal">Originaltitel(.*)class="Normal">Herstellungsland</expression> </RegExp> - <RegExp input="$$7" output="\1" dest="5+"> <RegExp input="$$8" output="<originaltitle>\1</originaltitle>" dest="7"> <expression><b>([^>]+)</b></expression> @@ -85,14 +77,12 @@ </RegExp> <expression>(.*), (Die|Der|Das|The)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!--Year --> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression>view.php\?page=blaettern&Kat=Jahr&Text=([0-9]+)</expression> </RegExp> - <!--Director--> <RegExp input="$$9" output="<director>\1</director>" dest="5+"> <RegExp input="$$1" output="\1" dest="9"> @@ -100,78 +90,63 @@ </RegExp> <expression repeat="yes">Name=[^>]*>([^<]+)</expression> </RegExp> - <!--Plot outline --> <RegExp input="$$1" output="<outline>\1</outline><plot>\1</plot>" dest="5+"> <expression><b>Inhalt:</b>([^<]+)</expression> </RegExp> - <!--Genre--> <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> <expression repeat="yes">view.php\?page=genre&Genre=[^"]+">([^<]*)<</expression> </RegExp> - <!--Rating--> <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> <expression>Note: ([0-9\.]+)</expression> </RegExp> - <!--Votes--> <RegExp input="$$1" output="<votes>\1</votes>" dest="5+"> <expression>Stimmen: ([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> <expression>Freigabe: ([^"]*)"</expression> </RegExp> - <RegExp input="$$1" output="<id>\2</id>" dest="5+"> <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> - <!--URL to Plot --> <RegExp input="$$1" output="<url function="Inhaltsangabe">http://www.ofdb.de/plot/\1,\2,</url>" dest="5+"> <expression>Inhalt:</b>[^<]*<a href="plot/([0-9]+),([0-9]+),</expression> </RegExp> - <!--URL to MPAA / Studio / Runtime--> <RegExp input="$$1" output="<url function="OFDbInfo">http://www.ofdb.de/view.php?page=fassung&amp;fid=\1&amp;vid=\2</url>" dest="5+"> <expression><a href=.view.php.page=fassung&fid=([0-9]+)&vid=([0-9]+).>Kino:</expression> </RegExp> - <!--URL to IMDB--> <RegExp input="$$1" output="<url function="IMDB-Details">http://www.imdb.de/title/tt\2/</url>" dest="5+"> <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> - <!--URL to IMDBcredits--> <RegExp input="$$1" output="<url function="GetMovieCast">http://www.imdb.de/title/tt\2/fullcredits#cast</url>" dest="5+"> <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> - <!--URL to Fanart--> - <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=tt\2&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> + <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">tt\2</url>" dest="5+"> <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> - <!--URL to MoviePosterDB --> <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=\2</url>" dest="5+"> - <expression>(imdb.com/)Title\?([0-9]+)</expression> + <expression>(imdb.com/)Title\?([0-9]+)</expression> </RegExp> - <!-- Ofdb Poster --> <RegExp input="$$3" output="<url function="GetOfdbThumb" cache="$$2.html">\1</url>" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Cast --> <RegExp input="$$2" output="<url cache="$$2-credits.html" function="GetMovieCast">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <!--Plot--> <Inhaltsangabe dest="5"> <RegExp input="$$7" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details><plot>\1</plot></details>" dest="5+"> @@ -184,10 +159,9 @@ <RegExp input="$$9" output=" \1" dest="7+"> <expression noclean="1" repeat="yes"><br />([^<]+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> </Inhaltsangabe> - <!--Studio--> <OFDbInfo dest="5"> <RegExp input="$$4" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="5"> @@ -197,65 +171,61 @@ <RegExp input="$$1" output="<runtime>\1</runtime>" dest="4+"> <expression>Laufzeit: ([^<]*)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </OFDbInfo> - <!--IMDB-Details--> <IMDB-Details dest="5"> <RegExp input="$$3" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="5"> <RegExp input="$$1" output="<tagline>\1</tagline>" dest="3+"> <expression>Werbezeile:</h5>([^<]*)<</expression> - </RegExp> + </RegExp> <RegExp conditional="trailer" input="$$1" output="<url function="GetTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url>" dest="3+"> <expression>/vi([0-9]*)/"</expression> </RegExp> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">Drehbuchautor(.*)Premierendatum</expression> - </RegExp> + </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="3+"> - <expression><a href="/name/nm[^>]*>([^<]*)<</expression> - </RegExp> - <expression noclean="1"></expression> + <expression><a href="/name/nm[^>]*>([^<]*)<</expression> + </RegExp> + <expression noclean="1"/> </RegExp> </IMDB-Details> - <!-- MovieCast --> <GetMovieCast dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1"><table class="cast">(.*?)</table></expression> - </RegExp> - <RegExp input="$$6" output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> - <expression repeat="yes" noclean="1,2" trim="3,4"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd"> ... [^"]*"char">(.*?)</td></expression> - </RegExp> - <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> - <expression repeat="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> - </RegExp> - <expression noclean="1"></expression> - </RegExp> - </GetMovieCast> - + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><table class="cast">(.*?)</table></expression> + </RegExp> + <RegExp input="$$6" output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> + <expression repeat="yes" noclean="1,2" trim="3,4"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd"> ... [^"]*"char">(.*?)</td></expression> + </RegExp> + <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> + <expression repeat="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> + </RegExp> + <expression noclean="1"/> + </RegExp> + </GetMovieCast> <!-- Trailer --> - <GetTrailer dest="5"> - <RegExp conditional="trailer" input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> - <RegExp input="$$1" output="\1" dest="2"> - <expression noclean="1">"file"[^"]*"([^"]*)</expression> - </RegExp> - <RegExp input="$$1" output="$$2/\1" dest="2"> - <expression noclean="1">"id"[^"]*"([^"]*)</expression> - </RegExp> - <expression noclean="1"></expression> - </RegExp> - </GetTrailer> - + <GetTrailer dest="5"> + <RegExp conditional="trailer" input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> + <RegExp input="$$1" output="\1" dest="2"> + <expression noclean="1">"file"[^"]*"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="$$2/\1" dest="2"> + <expression noclean="1">"id"[^"]*"([^"]*)</expression> + </RegExp> + <expression noclean="1"/> + </RegExp> + </GetTrailer> <!-- Ofdb Poster --> <GetOfdbThumb dest="5"> <RegExp input="$$6" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<thumb>http://img.ofdb.de/film/\1</thumb>" dest="6+"> <expression><img src="http://img.ofdb.de/film/([^"]+)" [^>]*></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetOfdbThumb> </scraper> diff --git a/system/scrapers/video/ofdbxml.xml b/system/scrapers/video/ofdbxml.xml index 313b28a0b1..879466016a 100644 --- a/system/scrapers/video/ofdbxml.xml +++ b/system/scrapers/video/ofdbxml.xml @@ -4,12 +4,11 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="<url>http://xml.n4rf.net/ofdbgw/movie/\2</url>" dest="3"> <expression clear="yes" noclean="1">(http://www.ofdb.de/film/)([0-9]*)</expression> @@ -21,19 +20,16 @@ <expression>(imdb.com/title/tt)([0-9]*)</expression> </RegExp> </NfoUrl> - <GetByIMDBId dest="3"> <RegExp input="$$1" output="<url>http://xml.n4rf.net/ofdbgw/movie/\1</url>" dest="3+"> <expression repeat="yes"><ofdbid>([^<]+)</expression> </RegExp> </GetByIMDBId> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://xml.n4rf.net/ofdbgw/search/\1" dest="3"> <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><year>\3</year><url>http://xml.n4rf.net/ofdbgw/movie/\1</url><id>\1</id></entity>" dest="5+"> @@ -42,21 +38,20 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - - <GetDetails dest="3"> - <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="3"> - <RegExp input="$$6" output="\1" dest="5+"> - <RegExp input="$$1" output="<title>\1</title>" dest="6"> - <expression trim="1"><titel>([^<]+)</titel></expression> - </RegExp> - <RegExp input="$$7" output="<title>\2 \1</title>" dest="6"> - <RegExp input="$$1" output="\1" dest="7"> + <GetDetails dest="3"> + <RegExp input="$$5" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="3"> + <RegExp input="$$6" output="\1" dest="5+"> + <RegExp input="$$1" output="<title>\1</title>" dest="6"> + <expression trim="1"><titel>([^<]+)</titel></expression> + </RegExp> + <RegExp input="$$7" output="<title>\2 \1</title>" dest="6"> + <RegExp input="$$1" output="\1" dest="7"> <expression trim="1"><titel>([^<]+)</titel></expression> </RegExp> <expression>(.*), (Die|Der|Das|The)</expression> - </RegExp> - <expression noclean="1"/> - </RegExp> + </RegExp> + <expression noclean="1"/> + </RegExp> <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5+"> <expression noclean="1"><alternativ>([^<]+)</expression> </RegExp> @@ -105,25 +100,24 @@ <RegExp input="$$1" output="<thumb>\1</thumb>" dest="5+"> <expression><bild>([^<]+)</expression> </RegExp> - <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=tt\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> + <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">tt\1</url>" dest="5+"> <expression><imdbid>([^<]+)</expression> </RegExp> <expression noclean="1"/> </RegExp> </GetDetails> - <GetOFDBData dest="5"> - <RegExp input="$$6" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="5+"> - <RegExp input="$$1" output="<studio>\1</studio>" dest="6+"> + <RegExp input="$$6" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="5+"> + <RegExp input="$$1" output="<studio>\1</studio>" dest="6+"> <expression trim="1"><label>([^<|^(]*)</expression> - </RegExp> - <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="6+"> - <expression trim="1"><freigabe>([^<]+)</expression> - </RegExp> - <RegExp input="$$1" output="<runtime>\1</runtime>" dest="6+"> - <expression trim="1"><laufzeit>([^<]+)</expression> - </RegExp> - <expression noclean="1"/> - </RegExp> + </RegExp> + <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="6+"> + <expression trim="1"><freigabe>([^<]+)</expression> + </RegExp> + <RegExp input="$$1" output="<runtime>\1</runtime>" dest="6+"> + <expression trim="1"><laufzeit>([^<]+)</expression> + </RegExp> + <expression noclean="1"/> + </RegExp> </GetOFDBData> </scraper> diff --git a/system/scrapers/video/ptgate.xml b/system/scrapers/video/ptgate.xml index 629849fd8a..7316aedf8c 100644 --- a/system/scrapers/video/ptgate.xml +++ b/system/scrapers/video/ptgate.xml @@ -7,51 +7,48 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Utilizar apenas o Cinema PTGate" type="bool" id="ptgateonly" default="false"></setting>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Incluir detalhes e fotos dos Actores" type="bool" id="fullcredits" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Incluir detalhes do IMPAwards" type="bool" id="impawards" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Incluir detalhes do MoviePosterDB" type="bool" id="movieposterdb" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Incluir trailer" type="bool" id="trailer" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Incluir Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Tamanhos do Poster e das Fotos dos Actores" type="labelenum" values="192|256|384|512|1024" id="imdbscale" default="512"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Url para acesso ao IMDb" type="text" id="url" default="akas.imdb.com"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> - <NfoUrl dest="3"> <RegExp input="$$1" output="\1" dest="3"> <expression clear="yes" noclean="1">(http://www.cinema.ptgate.pt/filmes/[0-9]*)</expression> </RegExp> </NfoUrl> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.cinema.ptgate.pt/pesquisa/?q=\1</url>" dest="3"> <expression noclean="1">([^\(]+)</expression> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp dest="5+" input="$$1" output="<entity><title>\2 - \4 (\3)</title><url>http://www.cinema.ptgate.pt/filmes/\1</url><id>\1</id></entity>"> @@ -60,32 +57,27 @@ <RegExp dest="5" input="$$1" output="<entity><title>\2 - \3 (\4)</title><url>http://www.cinema.ptgate.pt/filmes/\1</url><id>\1</id></entity>"> <expression trim="2,4"><a href="/filmes/([0-9]*)" class="upper">([^<]*)</a> <small>\(([0-9]*)\)<br />([^<]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails clearbuffers="no" dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!-- Id --> <RegExp dest="5" input="$$2" output="<id>\1</id>"> - <expression></expression> + <expression/> </RegExp> - <!-- Title --> <RegExp dest="5+" input="$$1" output="<title>\1</title>"> <expression><h2>([^<]*)</h2></expression> </RegExp> - <!-- Plot --> <RegExp dest="5+" input="$$1" output=";<plot>\1</plot>"> <expression><b>sinopse[^\n]*\s+([^\n]*)</expression> </RegExp> - <!-- Outline --> <RegExp dest="5+" input="$$1" output="<outline>\1</outline>"> <expression><b>sinopse[^\n]*\s+(.*?[^A-Z]\.)</expression> </RegExp> - <!-- Genre --> <RegExp dest="5+" input="$$9" output="<genre>\1</genre>"> <RegExp dest="9" input="$$1" output="\1,"> @@ -93,15 +85,13 @@ </RegExp> <expression repeat="yes" trim="1">([^,]+),</expression> </RegExp> - <!-- Year --> <RegExp dest="11" input="$$1" output="<year>\1</year>"> <expression><b>ano</b>: ([^<]*)</expression> </RegExp> <RegExp dest="5+" input="$$11" output="\1"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Actor --> <RegExp dest="8" input="$$9" output="<actor><name>\1</name></actor>"> <RegExp input="$$1" output="\1," dest="9"> @@ -110,12 +100,11 @@ <expression clear="yes" repeat="yes" trim="1">([^,]*),</expression> </RegExp> <RegExp dest="4" input="$$8" output="<actors>\1</actors>"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp dest="5+" input="$$8" conditional="ptgateonly" output="\1"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Director --> <RegExp dest="8" input="$$9" output="<director>\1</director>"> <RegExp input="$$1" output="\1," dest="9"> @@ -124,69 +113,61 @@ <expression repeat="yes" trim="1">([^,]+),</expression> </RegExp> <RegExp dest="4+" input="$$8" output="<directors>\1</directors>"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp dest="5+" input="$$8" conditional="ptgateonly" output="\1"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Add PTGate image as last Thumb --> <RegExp dest="12" input="$$2" output="<thumb>http://www.cinema.ptgate.pt/Movies/\1.jpg</thumb>"> - <expression></expression> + <expression/> </RegExp> <RegExp dest="5+" input="$$12" conditional="ptgateonly" output="\1"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Add PT Distributor --> <RegExp dest="13" input="$$1" output="<studio>Dist: \1</studio>"> <expression><b>distribuidora</b>: ([^<]*)</expression> </RegExp> <RegExp dest="5+" input="$$13" conditional="ptgateonly" output="\1"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- IMDB Details --> <RegExp dest="5+" input="$$10" conditional="!ptgateonly" output="\1"> <!-- Use Google as last resort --> - <RegExp dest="10" input="$$8" output="<url function="GetIMDBfromGoogle">http://www.google.com/search?q=site:imdb.com\1</url>"> + <RegExp dest="10" input="$$8" output="<url function="GetIMDBfromGoogle">http://www.google.com/search?q=site:imdb.com\1</url>"> <!-- search google for the original title --> <RegExp input="$$1" output="\1" dest="7"> <expression trim="1">\&#8250; ([^<]+)<br /></expression> </RegExp> <!-- add year to search string --> <RegExp input="$$11" output="+\1" dest="8"> - <expression></expression> + <expression/> </RegExp> <!-- remove spaces and , --> <RegExp input="$$7" output="+\1" dest="8+"> <expression repeat="yes">([^ ,]+)</expression> </RegExp> - <expression></expression> - </RegExp> - + <expression/> + </RegExp> <!-- use IMDB link on PTGATE, when available --> - <RegExp dest="10" input="$$9" output="<url function="GetIMDBDetails">http://$INFO[url]/title/\1/</url>"> + <RegExp dest="10" input="$$9" output="<url function="GetIMDBDetails">http://$INFO[url]/title/\1/</url>"> <RegExp dest="9" input="$$1" output="\1"> <expression clear="yes">\.imdb\.com/title/(tt[0-9]*)</expression> </RegExp> <expression>(.+)</expression> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - - <GetIMDBfromGoogle clearbuffers="no" dest="3"> <RegExp input="$$5" dest="3" output="<details>\1</details>"> <RegExp input="$$1" dest="5" output="<url function="GetIMDBDetails">http://$INFO[url]/title/\1/</url>"> <expression>\.imdb\.com/title/(tt[0-9]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetIMDBfromGoogle> <GetIMDBDetails clearbuffers="no" dest="3"> @@ -195,86 +176,70 @@ <RegExp input="$$1" dest="2" output="\1"> <expression>id=(tt[t0-9]*)</expression> </RegExp> - <!-- Studio --> <RegExp input="$$1" output="<studio>\1</studio>" dest="5"> <expression clear="yes" repeat="yes">"/company/[^/]*/">([^<]*)</a></expression> </RegExp> <RegExp input="$$13" output="\1" dest="5+"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <!-- Certificates --> <RegExp input="$$1" output="<certification>\1 \3</certification>" dest="5+"> <expression repeat="yes"><a href="/List\?certificates=[^"]*">([^<]*)</a>[^<]*(<i>([^<]*)</i>)?</expression> </RegExp> - <!-- Runtime --> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression trim="1"><h5>Runtime:</h5>[^0-9]*([^<|]*)</expression> </RegExp> - <!-- Rating --> <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="5+"> <expression><b>([0-9.]+)/10</b>[^<]*<a href="ratings" class="tn15more">([0-9,]+) votes</a></expression> </RegExp> - <!-- Actor --> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetIMDBCast">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Director --> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetMovieDirectors">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Credits --> <RegExp conditional="!fullcredits" input="$$2" output="<url cache="$$2-credits.html" function="GetIMDBWriters">$$3</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Actor, full --> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBCast">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Director, full --> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBDirectors">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Credits, full --> <RegExp conditional="fullcredits" input="$$2" output="<url cache="$$2-fullcredits.html" function="GetIMDBWriters">$$3fullcredits</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Thumb, IMPAwards --> <RegExp conditional="impawards" input="$$2" output="<url cache="$$2-posters.html" function="GetIMPALink">$$3posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Poster, MoviePosterDB --> <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?type=movies&amp;query=\1</url>" dest="5+"> <expression>/title/tt([t0-9]*)/faq</expression> </RegExp> - <!-- Trailer --> <RegExp conditional="trailer" input="$$1" output="<url function="GetIMDBTrailer">http://$INFO[url]/video/imdb/vi\1/player</url>" dest="5+"> <expression>/vi([0-9]*)/"</expression> </RegExp> - <!-- Thumb, IMDB --> <RegExp input="$$2" output="<url cache="$$2-posters.html" function="GetIMDBPoster">$$3posters</url>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <!-- Fanart --> - <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=$$2&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression></expression> - </RegExp> - - <expression noclean="1"></expression> + <RegExp conditional="fanart" input="$$2" output="<url function="GetTMDBFanartByIMDBId">$$2</url>" dest="5+"> + <expression/> + </RegExp> + <expression noclean="1"/> </RegExp> </GetIMDBDetails> </scraper> diff --git a/system/scrapers/video/speedallocinev3.xml b/system/scrapers/video/speedallocinev3.xml index 389ee07434..b91721ee15 100644 --- a/system/scrapers/video/speedallocinev3.xml +++ b/system/scrapers/video/speedallocinev3.xml @@ -1,28 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <scraper framework="1.0" date="2009-05-30" name="speedallocinev3.fr" content="movies" thumb="allocine.jpg" language="fr"> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="http://passion-xbmc.org/scraper/index.php?search=\1" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="2"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="2"> <RegExp input="$$1" output="\1" dest="5"> <expression trim="1" noclean="1">(.*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails clearbuffers="no" dest="3"> <RegExp input="$$5" output="\1" dest="3"> <RegExp input="$$1" output="\1" dest="5"> <expression trim="1" noclean="1">(.*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - </scraper> diff --git a/system/scrapers/video/sratim.xml b/system/scrapers/video/sratim.xml index 12689aee1d..c7971e313a 100644 --- a/system/scrapers/video/sratim.xml +++ b/system/scrapers/video/sratim.xml @@ -19,13 +19,11 @@ <expression noclean="1"/> </RegExp> </GetSettings> - <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.sratim.co.il/movies/search.aspx?Keyword=\1</url>" dest="3"> <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.sratim.co.il/\1</url></entity>" dest="5"> @@ -34,7 +32,6 @@ <expression clear="yes" noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> @@ -88,13 +85,12 @@ <RegExp conditional="imdbrank" input="$$1" output="<votes>\1</votes>" dest="5+"> <expression trim="1" repeat="no">Star_IMDB.*?<span.*?>([0-9]+?) מדרגים</span></expression> </RegExp> - <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> + <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">\1</url>" dest="5+"> <expression trim="1" repeat="no">http://www\.imdb\.com/title/(tt\d+?)'</expression> </RegExp> <expression noclean="1"/> </RegExp> </GetDetails> - <GetActorDetails dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5+"> <RegExp input="$$1" output="<actor><name>\1</name><thumb>http://www.sratim.co.il\2</thumb></actor>" dest="2+"> @@ -103,7 +99,6 @@ <expression noclean="1"/> </RegExp> </GetActorDetails> - <GetIMDBDetails dest="5"> <RegExp input="$$3" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><details>\1</details>" dest="5+"> <RegExp conditional="trailer" input="$$1" output="<url function="GetIMDBTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url>" dest="3+"> diff --git a/system/scrapers/video/tmdb.xml b/system/scrapers/video/tmdb.xml index 92c688cf82..6702069ae2 100644 --- a/system/scrapers/video/tmdb.xml +++ b/system/scrapers/video/tmdb.xml @@ -5,12 +5,12 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable Trailers from Dtrailer.com" type="bool" id="trailer" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <CreateSearchUrl dest="3"> @@ -18,7 +18,7 @@ <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> @@ -80,7 +80,6 @@ <RegExp input="$$1" output="<url cache="tmdb-$$2.xml" function="GetTMDBThumbs">$$3</url>" dest="5+"> <expression/> </RegExp> - <RegExp conditional="fanart" input="$$1" output="<url cache="tmdb-$$2.xml" function="GetTMDBFanart">$$3</url>" dest="5+"> <expression/> </RegExp> @@ -91,7 +90,7 @@ </RegExp> <expression repeat="yes">([a-zA-Z0-9]+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> <expression noclean="1"/> </RegExp> diff --git a/system/scrapers/video/tvcom.xml b/system/scrapers/video/tvcom.xml index c4f391ebd3..a0de4702b8 100644 --- a/system/scrapers/video/tvcom.xml +++ b/system/scrapers/video/tvcom.xml @@ -2,7 +2,7 @@ <scraper framework="1.0" date="2009-05-22" name="TV.com" content="tvshows" thumb="tvcom.png" language="en"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.tv.com/search.php?type=Search&amp;stype=ajax_search&amp;qs=\1&amp;search_type=program&amp;pg_results=0&amp;sort=</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="3"> @@ -10,7 +10,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.tv.com/show/\1/summary.html</url><url>http://www.tv.com/show/\1/cast.html</url><url>http://www.tv.com/show/\1/episode_listings.html?season=All</url><id>\1</id></entity>" dest="4"> <expression repeat="yes" noclean="1"><a href="http://www\.tv\.com/[^/]*/show/([0-9]+)/summary\.html[^"]*"[^>]*>([^<]+)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="7"> @@ -24,15 +24,14 @@ <!-- <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> <expression>id="summary_fold" class="mt-10">\W*(.*?) *?</div></expression> </RegExp> --> - <RegExp input="$$8" output="<plot>\1</plot>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> <expression><span class="long">(.*)</span>[^<]*<span class="short"></expression> </RegExp> <RegExp input="$$6" output="\1" dest="8"> - <expression repeat="yes"></expression> + <expression repeat="yes"/> </RegExp> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> <expression><span>Show Score</span>[^0-9]*([0-9\.]*)</expression> @@ -56,9 +55,9 @@ <RegExp input="$$3" output="<url>http://www.tv.com/show/$$4/episode_listings.html?season=\1</url>" dest="8"> <expression repeat="yes">/show/[0-9]+/episode_listings\.html\?season=([0-9]+)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> @@ -70,7 +69,7 @@ <RegExp input="$$1" output="<episode><title>\3</title><id>\2</id><url >http://www.tv.com/episode/\2/summary.html</url><epnum>\1</epnum><season>$$6</season></episode>" dest="5"> <expression repeat="yes"><div>([0-9]*)</div></td><td class="ep_title"><div><a href="http://www\.tv\.com/[^/]*/[^/]*/episode/([0-9]*)/summary\.html[^>]*>([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeList> @@ -103,7 +102,7 @@ <RegExp input="$$1" output="<code>\1</code>" dest="5+"> <expression><span>Prod Code:</span>([^<]*)</li></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeDetails> diff --git a/system/scrapers/video/tvdb.xml b/system/scrapers/video/tvdb.xml index 559902a12b..014bdccdeb 100644 --- a/system/scrapers/video/tvdb.xml +++ b/system/scrapers/video/tvdb.xml @@ -4,31 +4,31 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<url function="GetLanguages">http://www.thetvdb.com/api/1D62F2F90030C444/languages.xml</url>" dest="5"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Use DVD Order" type="bool" id="dvdorder" default="false" enable="!eq(1,true)"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <!-- Absolute ordering is great for Animes it actually trick XBMC by telling it that the serie has only one season and uses the 'absolute_number' as episodes numbers --> <RegExp input="$$1" output="<setting label="Use Absolute Ordering (Single Season)" type="bool" id="absolutenumber" default="false" enable="!eq(-1,true)"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Enable Fanart" type="bool" id="fanart" default="true"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Prefer Posters" type="bool" id="posters" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting type="sep"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> <RegExp input="$$1" output="<setting label="Language Override for Banners" type="bool" id="override" default="false"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> @@ -45,7 +45,6 @@ <expression>(.*?http://thetvdb.com.*)</expression> </RegExp> </EpisodeGuideUrl> - <!-- input: $1=query string --> <!-- returns: the url we should use to do the search --> <CreateSearchUrl dest="3"> @@ -53,10 +52,9 @@ <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression></expression> + <expression/> </RegExp> </CreateSearchUrl> - <!-- input: $1=html $2=search query --> <!-- returns: results in xml format <results><movie><title>*</title><url>*</url>*#urls<extra>*</extra></movie>*</results> --> <GetSearchResults dest="1"> @@ -67,10 +65,9 @@ <RegExp input="$$3" output="<entity><title>\3</title><language>\2</language><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/\2.zip</url><id>\1</id></entity>" dest="4"> <expression repeat="yes"><seriesid>([0-9]*)</seriesid>[^<]*<language>([^<]*)</language>[^<]*<SeriesName>([^<]*)</SeriesName></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> - <!-- input: $1..#urls=html --> <!-- input: $(#urls+1): extra !--> <!-- returns: results in xml format <details><plot>*</plot><director>*</director><premiered>*</premiered><episodeguide>*</episodeguide></details> --> @@ -163,15 +160,14 @@ <RegExp conditional="override" input="$$5" output="<thumb dim="\2" colors="\3" preview="_cache/\1">\1</thumb>" dest="7+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>fanart</BannerType>[^<]*<BannerType2>([^<]*)</BannerType2>[^<]*<Colors>([^<]*)</Colors>[^<]*<Language>[a-z]*</Language></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> <RegExp input="$$2" output="<episodeguide><url cache="$$2.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url></episodeguide>" dest="4+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> - <!-- input: $1=html !--> <!-- input: $2=series url !--> <!-- returns: results in xml format <episodeguide><episode><title>*</title><url>*</url><season>*</season><epnum>*</epnum><thumb>*</thumb><id>*</id><aired>*</aired></episode>*</episodeguide> !--> @@ -203,10 +199,9 @@ <RegExp conditional="dvdorder" input="$$1" output="<episode><title>\4</title><url cache="$$10.xml">$$2</url><epnum>\2</epnum><season>\3</season><id>\1</id><aired>\5</aired></episode>" dest="4"> <expression repeat="yes"><Episode>.*?<id>([0-9]+).*?<Combined_episodenumber>([0-9]+).*?<Combined_season>([0-9]+).*?<EpisodeName>([^<]*).*?<FirstAired>([^<]*)</FirstAired>.*?</Episode></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeList> - <!-- input: $1=html --> <!-- returns: results in xml format <details><writer>*</writer><director>*</director><cast>*</cast><rating>*</rating><rank>*</rank><plot>*</plot> --> <GetEpisodeDetails dest="3"> @@ -258,7 +253,7 @@ </RegExp> <!-- Absolute Numbering --> <RegExp conditional="absolutenumber" input="$$8" output="<season>1</season>" dest="4+"> - <expression></expression> + <expression/> </RegExp> <RegExp conditional="absolutenumber" input="$$8" output="<episode>\1</episode>" dest="4+"> <expression><absolute_number>([^<]*)</absolute_number></expression> @@ -270,7 +265,6 @@ <RegExp conditional="!absolutenumber" input="$$8" output="<episode>\1</episode>" dest="4+"> <expression><EpisodeNumber>([^<]*)</EpisodeNumber></expression> </RegExp> - <RegExp input="$$8" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression><filename>([^<]+)</filename></expression> </RegExp> @@ -289,16 +283,15 @@ <RegExp input="$$8" output="<rating>\1</rating>" dest="4+"> <expression><Rating>([^<]+)</Rating></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeDetails> - <GetLanguages dest="3"> <RegExp input="$$2" output="<settings><setting label="Language" type="labelenum" id="language" values="$$8" sort="yes" default="en"></setting></settings>" dest="3"> <RegExp input="$$1" output="\1|" dest="8+"> <expression repeat="yes"><abbreviation>([^<]*)</abbreviation></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetLanguages> </scraper> diff --git a/system/scrapers/video/tvrage.xml b/system/scrapers/video/tvrage.xml index c90a929a48..a398a417ba 100644 --- a/system/scrapers/video/tvrage.xml +++ b/system/scrapers/video/tvrage.xml @@ -2,7 +2,7 @@ <scraper framework="1.0" date="2009-05-22" name="TV Rage" content="tvshows" thumb="tvrage.jpg" language="en"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://www.tvrage.com/search.php?search=\1</url>" dest="3"> - <expression></expression> + <expression/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="3"> @@ -10,7 +10,7 @@ <RegExp input="$$1" output="<entity><title>\2</title><url>http://www.tvrage.com/\1</url></entity>" dest="4"> <expression repeat="yes"><td class='b1'><img[^>]*> <a[^h]*href='http://www\.tvrage\.com/([^']*)' >([^<]*)</a></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="7"> @@ -48,7 +48,7 @@ <RegExp input="$$1" output="<episodeguide><url>http://www.tvrage.com\1all</url></episodeguide>" dest="5+"> <expression trim="1">href='([^']*)'>Episode List</a><br></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> <GetEpisodeList dest="3"> @@ -56,7 +56,7 @@ <RegExp input="$$1" output="<episode><url>http://www.tvrage.com\1</url><epnum>\3</epnum><season>\2</season></episode>" dest="5+"> <expression repeat="yes">class='b1'><a href='([^']*)'>([0-9]+)+x([0-9]+)</i></a></td></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeList> <GetEpisodeDetails dest="3"> @@ -94,7 +94,7 @@ </RegExp> <expression repeat="yes">\| ([^\|]*)</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetEpisodeDetails> </scraper> diff --git a/system/scrapers/video/worldart.xml b/system/scrapers/video/worldart.xml index 3422860460..b0388d2116 100644 --- a/system/scrapers/video/worldart.xml +++ b/system/scrapers/video/worldart.xml @@ -22,13 +22,11 @@ <expression noclean="1"/> </RegExp> </GetSettings> - <CreateSearchUrl dest="3" SearchStringEncoding="CP1251"> <RegExp input="$$1" output="http://www.world-art.ru/search.php?name=\1&global_sector=all" dest="3"> <expression noclean="1"/> </RegExp> </CreateSearchUrl> - <GetSearchResults dest="8"> <RegExp input="$$5" output="<?xml version="1.0" encoding="windows-1251" standalone="yes"?><results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\4</title><url>http://www.world-art.ru/\1/\1.php?id=\3</url><id>\3</id></entity>" dest="5+"> @@ -40,7 +38,6 @@ <expression noclean="1"/> </RegExp> </GetSearchResults> - <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!-- ID --> @@ -54,27 +51,22 @@ <RegExp input="$$1" output="<title>\1</title>" dest="5+"> <expression trim="1"><h1 class='h1'[^>]*>([^<]+)</h1></expression> </RegExp> - <!-- TYPE --> <RegExp input="$$1" output="\1" dest="7"> <expression trim="1">/([^/]+)/review.php</expression> </RegExp> - <!-- MPAA --> <RegExp input="$$1" output="<url cache="\1-imdb.html" function="MPAA">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression>imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- TOP250 --> <RegExp input="$$1" output="<url cache="\1-imdb.html" function="TOP">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression>imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- YEAR --> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression>year=([^"']+)["']</expression> </RegExp> - <!-- RUNTIME --> <RegExp input="$$1" output="<runtime>\1 min</runtime>" dest="5+"> <expression noclean="1"> , ([^]+) </expression> @@ -82,7 +74,6 @@ <RegExp input="$$1" output="<url cache="\1-imdb.html" function="RUNTIME">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression noclean="1" clear="no">imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- RATING --> <RegExp input="$$1" output="<url function="GetRating">http://www.world-art.ru/$$7/votes_history.php?id=$$2</url>" dest="5+"> <expression/> @@ -90,21 +81,17 @@ <RegExp input="$$1" output="<url cache="\1-imdb.html" function="GetRatingAndVotes">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression noclean="1" clear="no">imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- GENRE --> <RegExp input="$$1" output="<genre>\2</genre>" dest="5+"> <expression repeat="yes">genre=([^>]+)>([^<]+)<</expression> </RegExp> - <!-- STUDIO --> <RegExp input="$$1" output="<url function="GetStudios">http://www.world-art.ru/$$7/$$7_full_production.php?id=$$2</url>" dest="5+"> <expression/> </RegExp> - <RegExp input="$$1" output="<url cache="\1-imdb.html" function="GetIMDBStudios">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression noclean="1" clear="no">imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- DIRECTORS, WRITERS, ACTORS --> <RegExp conditional="!imdbcast" input="$$1" output="<url function="GetPeople">http://www.world-art.ru/$$7/$$7_full_cast.php?id=$$2</url>" dest="5+"> <expression/> @@ -124,7 +111,6 @@ <RegExp conditional="imdbcred" input="$$1" output="<url cache="\1-fullcredits.html" function="GetIMDBWriters">http://www.imdb.com/title/tt\1</url>" dest="5+"> <expression noclean="1" clear="no">imdb.com/title/tt([0-9]*)</expression> </RegExp> - <!-- OUTLINE, PLOT --> <RegExp input="$$1" output="\1&#133;&hellip;&laquo;&#151;&mdash;&nbsp;" dest="9"> <expression noclean="1"><p align=justify class='review'>[\t\n]*(.*?)[\t\n]*</p></expression> @@ -150,70 +136,60 @@ </RegExp> <expression trim="1">(.*)\.{3}?</expression> </RegExp> - <!-- THUMBS --> <RegExp conditional="!thepos" input="$$1" output="<url function="GetCoverThumbs">http://www.world-art.ru/$$7/$$7_poster.php?id=$$2</url>" dest="5+"> <expression/> </RegExp> - <RegExp conditional="thepos" input="$$1" output="<url function="GetTMDBThumbsByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=tt\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression noclean="1" clear="no">imdb.com/title/tt([0-9]*)</expression> + <RegExp conditional="thepos" input="$$1" output="<url function="GetTMDBThumbsByIMDBId">\1</url>" dest="5+"> + <expression noclean="1" clear="no">imdb.com/title/([t0-9]*)</expression> </RegExp> - <!-- FANART --> - <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">http://api.themoviedb.org/2.0/Movie.imdbLookup?imdb_id=tt\1&amp;api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> - <expression>imdb.com/title/tt([0-9]*)</expression> + <RegExp conditional="fanart" input="$$1" output="<url function="GetTMDBFanartByIMDBId">\1</url>" dest="5+"> + <expression>imdb.com/title/([t0-9]*)</expression> </RegExp> <expression noclean="1"/> </RegExp> </GetDetails> - <!-- MPAA --> <MPAA dest="5"> <RegExp input="$$1" output="<details><mpaa>\1</mpaa></details>" dest="5+"> <expression trim="1">MPAA</a>:</h5>(.[^<]*)</expression> </RegExp> </MPAA> - <!-- TOP250 --> <TOP dest="5"> <RegExp input="$$1" output="<details><top250>\1</top250></details>" dest="5+"> <expression trim="1">Top 250: #([0-9]*)</a></expression> </RegExp> </TOP> - <!-- RUNTIME --> <RUNTIME dest="5"> <RegExp input="$$1" output="<details><runtime>\1</runtime></details>" dest="5+"> <expression trim="1"><h5>Runtime:</h5>[^0-9]*([^<]*)</expression> </RegExp> </RUNTIME> - <!-- RATINGS --> <GetRating dest="5"> <RegExp input="$$1" output="<details><rating>\1</rating><votes>10</votes></details>" dest="5+"> <expression trim="1"> :</b> ([^,]+),</expression> </RegExp> </GetRating> - <GetRatingAndVotes dest="5"> <RegExp input="$$1" output="<details><rating>\1</rating><votes>\2</votes></details>" dest="5+"> <expression trim="1"><b>([0-9.]+)/10</b>[^<]*<a href="ratings" class="tn15more">([0-9,]+) votes</a></expression> </RegExp> </GetRatingAndVotes> - <!-- STUDIOS --> <GetStudios dest="5"> <RegExp input="$$1" output="<details><studio>\1</studio></details>" dest="5+"> <expression repeat="yes">class='estimation'>([^<]+)<</expression> </RegExp> </GetStudios> - <GetIMDBStudios dest="5"> <RegExp input="$$1" output="<details><studio>\1</studio></details>" dest="5+"> <expression repeat="yes">"/company/[^/]*/">([^<]*)</a></expression> </RegExp> </GetIMDBStudios> - <!-- ACTORS --> <GetPeople dest="10"> <RegExp input="$$7" output="<details>\1</details>" dest="10"> @@ -226,10 +202,9 @@ <RegExp input="$$8" output="<actor><name>\1</name><role>\2</role></actor>" dest="7"> <expression repeat="yes">class='estimation'>([^<]+)<.*?&#151;([^<]+)<</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetPeople> - <!-- DIRECTORS --> <GetDirector dest="5"> <RegExp input="$$7" output="<details>\1</details>" dest="5+"> @@ -242,7 +217,6 @@ <expression noclean="1"/> </RegExp> </GetDirector> - <!-- WRITERS --> <GetCredits dest="5"> <RegExp input="$$7" output="<details>\1</details>" dest="5+"> @@ -255,7 +229,6 @@ <expression noclean="1"/> </RegExp> </GetCredits> - <!-- POSTERS --> <GetCoverThumbs dest="5"> <RegExp input="$$8" output="<details>\1</details>" dest="5+"> diff --git a/system/scrapers/video/yahoomusic.xml b/system/scrapers/video/yahoomusic.xml index b8c3138bd9..28fa52fe0d 100644 --- a/system/scrapers/video/yahoomusic.xml +++ b/system/scrapers/video/yahoomusic.xml @@ -3,14 +3,14 @@ <GetSettings dest="3"> <RegExp input="$$5" output="<settings>\1</settings>" dest="3"> <RegExp input="$$1" output="<setting label="Thumb(s) Size" type="labelenum" values="192|256|384|512|1024" id="yahooscale" default="384"></setting>" dest="5+"> - <expression></expression> + <expression/> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSettings> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>http://us.music.yahooapis.com/video/v1/list/search/all/\1?appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--&amp;response=artists,images</url>" dest="3"> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </CreateSearchUrl> <GetSearchResults dest="8"> @@ -18,7 +18,7 @@ <RegExp input="$$1" output="<entity><title>\4 - \1 (\2)</title><url>http://us.music.yahooapis.com/video/v1/item/\3?format=xml&amp;appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--</url></entity>" dest="5"> <expression repeat="yes"><Video.*?title="([^"]*)".*?copyrightYear="([^"]*)".*?\/([0-9]*)\?size.*?name="([^"]*)".*?</Video></expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetSearchResults> <GetDetails dest="3"> @@ -44,7 +44,7 @@ <RegExp input="$$1" output="<thumb>http://d.yimg.com/img.music.yahoo.com/image/v1/video/\1?size=$INFO[yahooscale]</thumb>" dest="5+"> <expression>\/([0-9]*)\?size</expression> </RegExp> - <expression noclean="1"></expression> + <expression noclean="1"/> </RegExp> </GetDetails> </scraper> |