diff options
| author | theuni <theuni-nospam-@xbmc.org> | 2012-01-19 02:53:58 -0500 |
|---|---|---|
| committer | theuni <theuni-nospam-@xbmc.org> | 2012-01-19 03:37:03 -0500 |
| commit | f9573f887b4460378d9b879de43a3e938dd1dc13 (patch) | |
| tree | 97de1d7483a264273eb765e5e95f4190e62b256d /addons/metadata.common.imdb.com | |
| parent | bb78c28fafa074eb69564396da41753c47f81303 (diff) | |
sync: common.imdb with addons repo
Diffstat (limited to 'addons/metadata.common.imdb.com')
| -rw-r--r-- | addons/metadata.common.imdb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/changelog.txt | 8 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/imdb.xml | 131 |
3 files changed, 83 insertions, 58 deletions
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 29b8f54d81..66fe1e3346 100644 --- a/addons/metadata.common.imdb.com/addon.xml +++ b/addons/metadata.common.imdb.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.imdb.com" name="IMDB common scraper functions" - version="2.1.3" + version="2.1.5" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index 0125b3a4dd..437fc1844d 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -1,3 +1,9 @@ +[B]2.1.5[/B] +- fixed: Cleanup and factored out Genres to common + +[B]2.1.4[/B] +- fixed: fetching directors and writers due to site changes + [B]2.1.3[/B] - fixed: make sure IMDb rating is geting fetched in every region @@ -38,4 +44,4 @@ - changed: adapted new IMDb layout [B]1.0.5[/B] -- fixed: tack /combined onto the end of the url to work around the new layout of IMDb
\ No newline at end of file +- fixed: tack /combined onto the end of the url to work around the new layout of IMDb diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 69a9b4dcb6..78e4318077 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -1,64 +1,23 @@ <scraperfunctions> - <GetIMDBRatingById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBRatingById> - <GetIMDBPlotById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBPlotById> - <GetIMDBCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBCastById> - <GetIMDBScaledCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBScaledCastById> - <GetIMDBDirectorsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBDirectorsById> - <GetIMDBWritersById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <GetIMDBGenresById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBGenres">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> - </GetIMDBWritersById> - <GetIMDBFullCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBFullCastById> - <GetIMDBScaledFullCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBScaledFullCastById> - <GetIMDBFullDirectorsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBFullDirectorsById> - <GetIMDBFullWritersById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetIMDBFullWritersById> - <GetIMDBThumbsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-posters.html" function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>" dest="5"> + </GetIMDBGenresById> + <ParseIMDBGenres dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> + <expression repeat="yes">itemprop="genre"[^>]+>([^<]+)</a></expression> + </RegExp> <expression noclean="1" /> </RegExp> - </GetIMDBThumbsById> - <GetIMDBTrailerById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="GetIMDBTrailerPage">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + </ParseIMDBGenres> + + <GetIMDBRatingById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> - </GetIMDBTrailerById> + </GetIMDBRatingById> <ParseIMDBRating dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="2"> @@ -67,6 +26,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBRating> + + <GetIMDBPlotById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBPlotById> <ParseIMDBPlot dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> @@ -75,6 +40,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBPlot> + + <GetIMDBCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBCastById> <ParseIMDBCast dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> @@ -92,6 +63,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBCast> + + <GetIMDBScaledCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBScaledCastById> <ParseIMDBScaledCast dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> @@ -109,28 +86,46 @@ <expression noclean="1" /> </RegExp> </ParseIMDBScaledCast> + + <GetIMDBDirectorsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBDirectorsById> <ParseIMDBDirectors dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> <expression clear="yes" noclean="1">Director[s]?.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<director>\1</director>" dest="2+"> - <expression repeat="yes" fixchars="1" clear="yes"><a href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1" clear="yes">href="/name[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBDirectors> + + <GetIMDBWritersById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBWritersById> <ParseIMDBWriters dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">Writer[s]?.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> - <expression repeat="yes" fixchars="1"><a href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1">href="/name[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBWriters> + + <GetIMDBFullCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullCastById> <ParseIMDBFullCast dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> @@ -145,6 +140,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBFullCast> + + <GetIMDBScaledFullCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBScaledFullCastById> <ParseIMDBScaledFullCast dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> @@ -159,6 +160,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBScaledFullCast> + + <GetIMDBFullDirectorsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullDirectorsById> <ParseIMDBFullDirectors dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp conditional="fullcredits" input="$$1" output="\1" dest="6"> @@ -170,6 +177,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBFullDirectors> + + <GetIMDBFullWritersById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullWritersById> <ParseIMDBFullWriters dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp conditional="fullcredits" input="$$1" output="\1" dest="6"> @@ -181,6 +194,12 @@ <expression noclean="1" /> </RegExp> </ParseIMDBFullWriters> + + <GetIMDBThumbsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-posters.html" function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBThumbsById> <ParseIMDBThumbs 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"> |