The branch, eden-pre has been updated
via e626b568528ebd74fb2b3a15eb7e20f3ceff59f6 (commit)
from 22ee42ec1ca1ccf370ab5d109b741cf6608e4b48 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e626b568528ebd74fb2b3a15eb7e20f3ceff59f6
commit e626b568528ebd74fb2b3a15eb7e20f3ceff59f6
Author: olympia <[email protected]>
Date: Sun Nov 13 18:30:27 2011 +0100
[metadata.kinopoisk.ru] updated to version 1.0.43
diff --git a/metadata.kinopoisk.ru/addon.xml b/metadata.kinopoisk.ru/addon.xml
index 233d72b..d255210 100644
--- a/metadata.kinopoisk.ru/addon.xml
+++ b/metadata.kinopoisk.ru/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.kinopoisk.ru"
name="KinoPoisk"
- version="1.0.37">
+ version="1.0.43">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.3"/>
diff --git a/metadata.kinopoisk.ru/changelog.Russian.txt
b/metadata.kinopoisk.ru/changelog.Russian.txt
index 2caaa6c..aba40a7 100644
--- a/metadata.kinopoisk.ru/changelog.Russian.txt
+++ b/metadata.kinopoisk.ru/changelog.Russian.txt
@@ -1,3 +1,15 @@
+1.0.43:
+- Ðзменен алгоÑиÑм полÑÑÐµÐ½Ð¸Ñ ÑÑейлеÑа,
Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð½Ð¾Ð²Ñе наÑÑÑойки
+1.0.42:
+- ÐÑпÑавлено полÑÑение позиÑии в ÑпиÑке
ÐинопоиÑк-ТÐÐ250
+1.0.41:
+- ÐÑпÑавлено полÑÑение ÑейÑинга кинопоиÑка
+1.0.40:
+- ÐÑпÑавлено полÑÑение ÑейÑинга MPAA
+1.0.39:
+- ÐÑпÑавлено
+1.0.38:
+- ÐÑпÑавлено полÑÑение ÑейÑинга Ñ ÑайÑа
kinopoisk.ru
1.0.37:
- ÐÑпÑавлено полÑÑение оÑигиналÑного
Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ (remezen at xbmc.ru)
1.0.36:
diff --git a/metadata.kinopoisk.ru/kinopoisk.xml
b/metadata.kinopoisk.ru/kinopoisk.xml
index c315dc6..1dea936 100644
--- a/metadata.kinopoisk.ru/kinopoisk.xml
+++ b/metadata.kinopoisk.ru/kinopoisk.xml
@@ -41,10 +41,10 @@
</RegExp>
<!--Êîä åñëè íàéäåíî íåñêîëüêî âàðèàíòîâ-->
<RegExp conditional="!search_originaltitle" input="$$1"
output="<entity><title>\2</title><year>\3</year><url>http://www.kinopoisk.ru/level/1/film/\1/sr/1/|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20x86_64%3B%20rv%3A2.0.1)%20Gecko%2F20100101%20Firefox%2F4.0.1&Accept-Language=ru-ru,ru%3Bq=0.8,en-us%3Bq=0.5,en%3Bq=0.3</url></entity>"
dest="5+">
- <expression repeat="yes"><p
class="name"><a
href="http://www.kinopoisk.ru/level/1/film/(\d+)/sr/1/">(.+?)</a>[^>]*?class="year">(\d+)<</expression>
+ <expression repeat="yes"><p
class="name"><a
href="/level/1/film/(\d+)/sr/1/">(.+?)</a>[^>]*?class="year">(\d+)<</expression>
</RegExp>
<RegExp conditional="search_originaltitle" input="$$1"
output="<entity><title>\2
[\4]</title><year>\3</year><url>http://www.kinopoisk.ru/level/1/film/\1/sr/1/|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20x86_64%3B%20rv%3A2.0.1)%20Gecko%2F20100101%20Firefox%2F4.0.1&Accept-Language=ru-ru,ru%3Bq=0.8,en-us%3Bq=0.5,en%3Bq=0.3</url></entity>"
dest="5+">
- <expression repeat="yes"><p
class="name"><a
href="http://www.kinopoisk.ru/level/1/film/(\d+)/sr/1/">(.+?)</a>[^>]*?class="year">(\d+)<.*?class="gray">(?:(?:\d+
ìèí)|)(.*?)(?:(?:, \d+ ìèí)|)<</expression>
+ <expression repeat="yes"><p
class="name"><a
href="/level/1/film/(\d+)/sr/1/">(.+?)</a>[^>]*?class="year">(\d+)<.*?class="gray">(?:(?:\d+
ìèí)|)(.*?)(?:(?:, \d+ ìèí)|)<</expression>
</RegExp>
<!-- fix html entities from titles-->
<RegExp conditional="search_originaltitle" input="$$5"
output="\1[]&laquo;&raquo;&nbsp;" dest="5">
@@ -79,7 +79,6 @@
$$13 - ãîä ñ kinopoisk
$$14 - ãîä ïðåìüåðû
$$15 - êîëè÷åñòâî ãîëîñîâ íà imdb
-
$$17 - ðóññêèé ôèëüì (true/false)
$$18 - ãîä èñïîëüçóåìûé äëÿ ïîèñêà
$$19 - íàçâàíèå ôèëüìà èñïîëüçóåìîå äëÿ ïîèñêà
@@ -116,9 +115,6 @@
<RegExp input="$$4" output="false" dest="17">
<expression>^$</expression>
</RegExp>
- <RegExp input="none" output="test$$17test" dest="5+">
- <expression>none</expression>
- </RegExp>
<!--COUNTRY-->
<RegExp input="$$1"
output="<country>\1</country>" dest="5+">
<expression repeat="yes"><a
href="/level/10/m_act%5Bcountry%5D/.+?/"><img
src="http://st.kinopoisk.ru/images/flags/flag.*?alt=";(.*?)"</expression>
@@ -132,7 +128,7 @@
</RegExp>
<!-- premier year -->
<RegExp input="$$1" output="\1" dest="14">
-
<expression>href="/level/80/film/\d+/".+?([0-9]+)</a></expression>
+
<expression>href="/level/80/film/\d+/"[^>]*>[^<]*([0-9]{4})</a></expression>
</RegExp>
<!-- êîëè÷åñòâî ãîëîñîâ íà imdb id -->
<RegExp input="$$1" output="\1 " dest="15">
@@ -147,11 +143,11 @@
</RegExp>
<!--TOP250-->
<RegExp input="$$1"
output="<top250>\1</top250>" dest="5+">
- <expression><a href="/level/56/film/\d+/"
style="color:#555">([0-9]*).+?</a></expression>
+ <expression>Òîï250: <a
href="/level/20/#([0-9]+)</expression>
</RegExp>
<!--Ðåéòèíã MPAA-->
<RegExp input="$$1"
output="<mpaa>\1</mpaa>" dest="5+">
- <expression><tr><td
class="type">[^<]+MPAA</td><td[^>]+><a
href='.+?/rn/(.+?)/'</expression>
+ <expression>itemprop="contentRating"[
]+content="MPAA[ ]+([^"]+)"</expression>
</RegExp>
<!--TAGLINE-->
<RegExp input="$$1"
output="<tagline>\1</tagline>" dest="5+">
@@ -161,21 +157,21 @@
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
<expression><td class="time"
id="runtime">([0-9]+)</expression>
</RegExp>
- <!--Ðåéòèíã IMDB-->
- <RegExp conditional="!kinopoisk_rating" input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="5+">
- <expression>IMDb: ([0-9.]+)
\(([0-9\s]+)\)</div></expression>
- </RegExp>
- <RegExp conditional="kinopoisk_rating" input="none"
output="" dest="2">
- <expression />
- </RegExp>
- <RegExp conditional="kinopoisk_rating" input="$$1"
output="\1:::\2 \3 \4" dest="2">
- <expression
noclean="2">itemprop="ratingValue">(.+?)</span><span.*?> (\d*) (\d*) (\d+)<</expression>
- </RegExp>
- <RegExp conditional="kinopoisk_rating" input="$$2"
output="<rating>\1</rating>" dest="5+">
- <expression noclean="1">(.*?):::.*</expression>
+ <!--Ðåéòèíã è ãîëîñà -->
+ <RegExp input="$INFO[RatingSource]" output="$$2"
dest="5+">
+ <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="2">
+ <expression>IMDb: ([0-9.]+)
\(([0-9\s]+)\)</div></expression>
+ </RegExp>
+ <expression>IMDB</expression>
</RegExp>
- <RegExp conditional="kinopoisk_rating" input="$$2"
output="<votes>\1</votes>" dest="5+">
- <expression noclean="1">.*?:::[ ]*([0-9
]+)</expression>
+ <RegExp input="$INFO[RatingSource]" output="$$2"
dest="5+">
+ <RegExp input="$$1" output="\1:::\2 \3 \4"
dest="2">
+
<expression>itemprop="ratingValue".+?<span>(.+?)</span>.+?itemprop="ratingCount">(?:&nbsp;|[
])*([0-9]*)(?:&nbsp;|[ ])*([0-9]*)(?:&nbsp;|[
])*([0-9]*)(?:&nbsp;|[ ])*<</expression>
+ </RegExp>
+ <RegExp input="$$2"
output="<rating>\1</rating><votes>\2</votes>" dest="2">
+ <expression
trim="1,2">(.*):::(.*)</expression>
+ </RegExp>
+ <expression>Kinopoisk</expression>
</RegExp>
<!--GENRE-->
<RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
@@ -220,31 +216,9 @@
<expression>href="(/level/17/film/([0-9]+)/)"</expression>
</RegExp>
<!--TRAILER-->
- <RegExp conditional="download_trailer" input="$$2"
output="\1" dest="5+">
- <RegExp input="$$1"
output="<country>\1</country>" dest="9">
- <expression repeat="yes"><a
href="/level/10/m_act%5Bcountry%5D/.+?/"><img
src=".*?/images/flags/flag.*?alt="(.*?)"</expression>
- </RegExp>
- <RegExp input="$$9" output="true" dest="9">
- <expression>Ðîññèÿ</expression>
- </RegExp>
- <!-- Åñëè ôèëüì ïðîèçâåä¸í â Ðîññèè, òî
âûáèðàåì ïåðâûé òðåéëåð -->
- <RegExp input="$$9" output="$$4" dest="2">
- <RegExp input="$$1" output="<url
function="GMT_Russia">http://www.kinopoisk.ru/level/16/film/\1</url>";
dest="4">
- <expression><a
href="/level/16/film/(\d+)/</expression>
- </RegExp>
- <expression>^true$</expression>
- </RegExp>
- <!-- Åñëè ôèëüì ïðîèçâåä¸í íå â Ðîññèè, òî
âûáèðàåì ðóññêèé òðåéëåð -->
- <RegExp input="$$9" output="$$3" dest="2">
- <RegExp input="$$1" output="<url
function="GMT">http://www.kinopoisk.ru/level/16/film/\1</url>";
dest="3">
- <expression><a
href="/level/16/film/(\d+)/</expression>
- </RegExp>
-
<expression>^<country></expression>
- </RegExp>
- <!-- -->
- <expression noclean="1" />
+ <RegExp conditional="download_trailer" input="$$1"
output="<url
function="GetTrailers">http://www.kinopoisk.ru/level/16/film/\1</url>";
dest="5+">
+ <expression><a
href="/level/16/film/(\d+)/</expression>
</RegExp>
-
<expression noclean="1"/>
</RegExp>
</GetDetails>
@@ -278,156 +252,109 @@
<expression noclean="1"/>
</RegExp>
</GMP_SINGLE>
- <GMT_Russia dest="4">
- <RegExp input="$$2" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<trailer
tilte="\1"><html>\2</html></trailer>" dest="3">
- <expression repeat="yes" noclean="2"><a
href="/level/16/film/[^"]+" class="all">(.*?)</a>(.*?)<!--
/ðîëèê</expression>
- </RegExp>
- <RegExp input="$$3" output="\1" dest="3">
- <expression
noclean="1">tilte="Òðåéëåð"(.*?)</trailer></expression>
- </RegExp>
- <!-- NOT HD TRAILERS-->
- <RegExp input="$$3" output="<trailer
quality="\2">\1</trailer>" dest="5">
- <expression repeat="yes"><td
width=20></td>.*?<a href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
- </RegExp>
- <!-- HD TRAILERS-->
- <RegExp conditional="download_hd" input="$$3"
output="<trailer type="HD"
quality="\2">\1</trailer>" dest="5+">
- <expression repeat="yes"><td
width=20><img src="http://st.kinopoisk.ru/images/icon-hd2.gif".*?<a
href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
- </RegExp>
- <!-- Ïûòàåìñÿ âûáðàòü ïðåäïî÷èòàåìîå êà÷åñòâî-->
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Âûñîêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Âûñîêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>High</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Ñðåäíåå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Ñðåäíåå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Medium</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Íèçêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Íèçêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Low</expression>
- </RegExp>
- <!-- Âûáèðàåì ïîñëåäíèé íàéäåííûé òðåéëåð (âåðîÿòíî îí
èìååò ìàêñèìàëüíîå êà÷åñòâî) íà ñëó÷àé åñëè íåòó ïðåäïî÷òèòåëüíîãî êà÷åñòâà-->
- <RegExp input="$$5" output="<trailer
id="best" >\1</trailer>" dest="2+">
-
<expression><trailer.*?>([^<]*)</trailer>$</expression>
- </RegExp>
- <expression noclean="1"/>
+ <GetTrailers clearbuffers="no" dest="4">
+ <!-- Èñïîëüçóåìûå áóôôåðû
+ $$10 - RegexpExpression, âîçâðàùàþùåå áëîêè òðåéëåðîâ:
{1} HTML-áëîê âñåãî ðîëèêà {2} ×òî óãîäíî, åñëè ðóññêèé, ëèáî ïóñòî {3} Íàçâàíèå
+ $$11 - RegexpExpression, âîçâðàùàþùåå ñàìè òðåéëåðû:
{1} ×òî óãîäíî, åñëè ðîëèê HD, ëèáî ïóñòî {2} ññûëêà íà ðîëèê {3} êà÷åñòâî -
"Âûñîêîå êà÷åñòâî" è ò.ä.
+ $$19 - ðóññêèå òðåéëåðû
+ $$20 - íåðóññêèå òðåéëåðû
+ -->
+ <RegExp input="" output="<!-- ðîëèê -->([^!]*?<div
style="position:
relative">[^<]*(?:<img[^>]*(flag-2.gif))*[^!]*?class="all">([^<]+)[^!]*)<!--
/ðîëèê -->" dest="10">
+ <expression/>
</RegExp>
- </GMT_Russia>
- <GMT dest="4">
- <RegExp input="$$2" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<trailer
tilte="\1"><html>\2</html></trailer>" dest="3">
- <expression repeat="yes"
noclean="2">src="http://st.kinopoisk.ru/images/flags/flag-2.gif".*?class="all"[^>]*>(.*?)</a>(.*?)<!--
/ðîëèê</expression>
- </RegExp>
- <RegExp input="$$3" output="\1" dest="3">
- <expression
noclean="1">tilte="Òðåéëåð.*?"(.*?)</trailer></expression>
- </RegExp>
- <!-- NOT HD TRAILERS-->
- <RegExp input="$$3" output="<trailer
quality="\2">\1</trailer>" dest="5">
- <expression repeat="yes"><td
width=20></td>.*?<a href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
- </RegExp>
- <!-- HD TRAILERS-->
- <RegExp conditional="download_hd" input="$$3"
output="<trailer type="HD"
quality="\2">\1</trailer>" dest="5+">
- <expression repeat="yes"><td
width=20><img src="http://st.kinopoisk.ru/images/icon-hd2.gif".*?<a
href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
+ <RegExp input="" output="<td width=20>(?:<img
src="http://st.kinopoisk.ru/images/icon-(hd)2.gif")*[^<]*</td[^<]*<td[^<]*<a
href="(?:.*?)&type=trailer&link=([^"]+)"
class="continue">(?:<b>)*(.+?)(?:</b>)*</a>"
dest="11">
+ <expression/>
+ </RegExp>
+ <!-- Ñîáèðàåì âñ¸ âèäåî -->
+ <RegExp input="$$1" output="<trailer tilte="\3"
flag="\2"><html>\1</html></trailer>" dest="3">
+ <expression repeat="yes" noclean="1" >$$10</expression>
+ </RegExp>
+
+ <!-- Îñòàâëÿåì òîëüêî òðåéëåðû è òèçåðû-->
+ <RegExp input="$$3" output="\1" dest="2">
+ <expression repeat="yes" noclean="1">(<trailer
tilte="[^"]*[Òò]ðåéëåð[^"]*".*?</trailer>)</expression>
+ </RegExp>
+ <RegExp input="$$3" output="\1" dest="2+">
+ <expression repeat="yes" noclean="1">(<trailer
tilte="[^"]*[Òò]èçåð[^"]*".*?</trailer>)</expression>
+ </RegExp>
+ <!-- Åñëè òðåéëåðû è òèçåðû íå íàéäåíû, áåðåì âñå ïîäðÿä -->
+ <RegExp conditional="GetAnyVideo" input="$$2" output="$$3"
dest="2">
+ <expression noclean="1">^$</expression>
+ </RegExp>
+ <!-- Áåðåì ñ ðóññêèì ôëàæêîì -->
+ <RegExp input="$$2" output="\1" dest="3">
+ <expression noclean="1" repeat="yes"
clear="yes">(<trailer tilte="[^"]*"
flag="[^"]+">.*?</trailer>)</expression>
+ </RegExp>
+ <RegExp input="$$3" output="<trailer lang="ru"
type="\1" quality="\3">\2</trailer>" dest="19">
+ <expression repeat="yes">$$11</expression>
+ </RegExp>
+ <!-- Áåðåì áåç ðóññêîãî ôëàæêà -->
+ <RegExp input="$$2" output="\1" dest="3+">
+ <expression noclean="1" repeat="yes"
clear="yes">(<trailer tilte="[^"]*"
flag="">.*?</trailer>)</expression>
+ </RegExp>
+ <RegExp input="$$3" output="<trailer lang=""
type="\1" quality="\3">\2</trailer>" dest="20">
+ <expression repeat="yes">$$11</expression>
+ </RegExp>
+ <!-- Â çàâèñèìîñòè îò íàñòðîåê, ñîðòèðóåì ëèáî ðóññêèå è
íåðóññêèå îòäåëüíî, ëèáî âñåé êó÷åé -->
+ <RegExp input="$INFO[TrailerPriority]"
output="<details><chain
function="SortTrailers">foreign</chain><chain
function="SortTrailers">russian</chain></details>"
dest="4+">
+ <expression>0</expression>
+ </RegExp>
+ <RegExp input="$INFO[TrailerPriority]"
output="<details><chain
function="SortTrailers">all</chain></details>"
dest="4+">
+ <expression>1</expression>
+ </RegExp>
+ </GetTrailers>
+ <SortTrailers clearbuffers="no" dest="4">
+ <RegExp input="$$1" output="$$19" dest="5">
+ <expression clear="no">russian</expression>
+ </RegExp>
+ <RegExp input="$$1" output="$$20" dest="5">
+ <expression clear="no">foreign</expression>
+ </RegExp>
+ <RegExp input="$$1" output="$$19$$20" dest="5">
+ <expression clear="no">all</expression>
+ </RegExp>
+ <!-- Ïåðåìåùàåì HD â íà÷àëî ñïèñêà, îãðàíè÷èâàÿ è ñîðòèðóÿ ïî
êà÷åñòâó -->
+ <RegExp input="$INFO[HdTrailerMaxQ]" output="$$6" dest="4">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*"
type="[^"]+" quality="Âûñîêîå
êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <!-- Ïûòàåìñÿ âûáðàòü ïðåäïî÷èòàåìîå êà÷åñòâî-->
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Âûñîêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Âûñîêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>High</expression>
+ <expression clear="yes">3</expression>
+ </RegExp>
+ <RegExp input="$INFO[HdTrailerMaxQ]" output="$$6" dest="4+">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*"
type="[^"]+" quality="Ñðåäíåå
êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Ñðåäíåå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Ñðåäíåå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Medium</expression>
+ <expression>3|2</expression>
+ </RegExp>
+ <RegExp input="$INFO[HdTrailerMaxQ]" output="$$6" dest="4+">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*"
type="[^"]+" quality="Íèçêîå
êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <RegExp input="$INFO[TrailerQ]" output="$$6" dest="2">
- <RegExp conditional="download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
type="HD" quality="Íèçêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd" input="$$5"
output="<trailer>\1</trailer>" dest="6">
- <expression repeat="yes"><trailer
quality="Íèçêîå êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Low</expression>
+ <expression>3|2|1</expression>
+ </RegExp>
+ <!--  êîíåö ñïèñêà ïîìåùàåì "íå HD" ðîëèêè, îãðàíè÷èâàÿ è
ñîðòèðóÿ ïî êà÷åñòâó -->
+ <RegExp input="$INFO[SdTrailerMaxQ]" output="$$6" dest="4+">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*" type=""
quality="Âûñîêîå êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <!-- Âûáèðàåì ïîñëåäíèé íàéäåííûé òðåéëåð (âåðîÿòíî îí
èìååò ìàêñèìàëüíîå êà÷åñòâî) íà ñëó÷àé åñëè íåòó ïðåäïî÷òèòåëüíîãî êà÷åñòâà-->
- <RegExp input="$$5" output="<trailer
id="best" >\1</trailer>" dest="2+">
-
<expression><trailer.*?>([^<]*)</trailer>$</expression>
+ <expression>3</expression>
+ </RegExp>
+ <RegExp input="$INFO[SdTrailerMaxQ]" output="$$6" dest="4+">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*" type=""
quality="Ñðåäíåå êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <!-- non-russian trailers -->
- <RegExp conditional="orig_trailer" input="$$5"
output="<trailer lang="orig" id="best"
>\1</trailer>" dest="2+">
- <RegExp input="$$1" output="<trailer
tilte="\1"><html>\2</html></trailer>" dest="3">
- <expression repeat="yes"
noclean="2"><a href="/level/16/film/[^"]+"
class="all">(.*?)</a>(.*?)<!-- /ðîëèê</expression>
- </RegExp>
- <RegExp input="$$3" output="\1" dest="3">
- <expression
noclean="1">tilte="Òðåéëåð"(.*?)</trailer></expression>
- </RegExp>
- <!-- NOT HD TRAILERS-->
- <RegExp input="$$3" output="<trailer
quality="\2">\1</trailer>" dest="5">
- <expression repeat="yes"><td
width=20></td>.*?<a href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
- </RegExp>
- <!-- HD TRAILERS-->
- <RegExp conditional="download_hd" input="$$3"
output="<trailer type="HD"
quality="\2">\1</trailer>" dest="5+">
- <expression repeat="yes"><td
width=20><img src="http://st.kinopoisk.ru/images/icon-hd2.gif".*?<a
href="(?:.*?)&type=trailer&link=(.*?)"
class="continue">(.*?)</a></expression>
- </RegExp>
- <!-- Ïûòàåìñÿ âûáðàòü ïðåäïî÷èòàåìîå êà÷åñòâî-->
- <RegExp conditional="orig_trailer"
input="$INFO[TrailerQ]" output="$$6" dest="2+">
- <RegExp conditional="download_hd"
input="$$5" output="<trailer lang="orig">\1</trailer>"
dest="6">
- <expression
repeat="yes"><trailer type="HD" quality="Âûñîêîå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd"
input="$$5" output="<trailer>\1</trailer>" dest="6">
- <expression
repeat="yes"><trailer quality="Âûñîêîå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>High</expression>
- </RegExp>
- <RegExp conditional="orig_trailer"
input="$INFO[TrailerQ]" output="$$6" dest="2+">
- <RegExp conditional="download_hd"
input="$$5" output="<trailer>\1</trailer>" dest="6">
- <expression
repeat="yes"><trailer type="HD" quality="Ñðåäíåå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd"
input="$$5" output="<trailer>\1</trailer>" dest="6">
- <expression
repeat="yes"><trailer quality="Ñðåäíåå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Medium</expression>
- </RegExp>
- <RegExp conditional="orig_trailer"
input="$INFO[TrailerQ]" output="$$6" dest="2+">
- <RegExp conditional="download_hd"
input="$$5" output="<trailer>\1</trailer>" dest="6">
- <expression
repeat="yes"><trailer type="HD" quality="Íèçêîå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <RegExp conditional="!download_hd"
input="$$5" output="<trailer>\1</trailer>" dest="6">
- <expression
repeat="yes"><trailer quality="Íèçêîå
êà÷åñòâî">(.*?)</trailer></expression>
- </RegExp>
- <expression>Low</expression>
- </RegExp>
- <!-- Âûáèðàåì ïîñëåäíèé íàéäåííûé òðåéëåð
(âåðîÿòíî îí èìååò ìàêñèìàëüíîå êà÷åñòâî) íà ñëó÷àé åñëè íåòó ïðåäïî÷òèòåëüíîãî
êà÷åñòâà-->
-
<expression><trailer.*?>([^<]*)</trailer>$</expression>
+ <expression>3|2</expression>
+ </RegExp>
+ <RegExp input="$INFO[SdTrailerMaxQ]" output="$$6" dest="4+">
+ <RegExp input="$$5" output="\1" dest="6">
+ <expression repeat="yes" noclean="1"
clear="yes">(<trailer lang="[^"]*" type=""
quality="Íèçêîå êà÷åñòâî">.*?</trailer>)</expression>
</RegExp>
- <!-- END non-russian trailers -->
- <expression noclean="1"/>
+ <expression>3|2|1</expression>
+ </RegExp>
+ <RegExp input="" output="<?xml version="1.0"
encoding="windows-1251"
standalone="yes"?><details>$$4</details>" dest="4">
+ <expression/>
</RegExp>
- </GMT>
+ </SortTrailers>
<STUDIOS dest="4">
<RegExp input="$$8" output="<?xml version="1.0"
encoding="windows-1251"
standalone="yes"?><details>\1</details>" dest="4">
<RegExp input="$$1" output="\1" dest="7">
@@ -678,7 +605,7 @@
<TitleToUTF8 clearbuffers="no" dest="4">
<RegExp input="none" output="" dest="4">
<expression/>
- </RegExp>
+ </RegExp>
<RegExp input="$$11" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details><title>\1</title></details>"
dest="4">
<RegExp input="$$1"
output="\1&laquo;&raquo;&nbsp;" dest="11">
<expression noclean="1"/>
@@ -737,7 +664,7 @@
<RegExp input="$$12" output="\1" dest="12">
<expression
noclean="1">(.*)&#xAB;</expression>
</RegExp>
- <!-- óäàëåì ìóñîð -->
+ <!-- óäàëåì ìóñîð -->
<RegExp input="$$12" output="\1" dest="12">
<expression noclean="1">(.*?) 3D$</expression>
</RegExp>
@@ -789,4 +716,4 @@
</RegExp>
</PlotToUTF8>
<!-- END UTF8 functions -->
-</scraper>
+</scraper>
\ No newline at end of file
diff --git a/metadata.kinopoisk.ru/resources/language/English/strings.xml
b/metadata.kinopoisk.ru/resources/language/English/strings.xml
index 75c260e..ef3072e 100644
--- a/metadata.kinopoisk.ru/resources/language/English/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/English/strings.xml
@@ -1,16 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">Enable TMDb fanart</string>
- <string id="30001">Add original title to search results</string>
- <string id="30002">Download russian trailers</string>
- <string id="30003">Prefer HD</string>
- <string id="30004">Prefered trailer quality</string>
- <string id="30005">Add non-rusian trailer</string>
- <string id="30006">Add TMDB poster</string>
- <string id="30007">Search IMDB ID</string>
- <string id="30008">Search IMDB ID with world premier year</string>
- <string id="30009">Force searching IMDB ID with google</string>
- <string id="30010">Get rating from KinoPoisk</string>
- <string id="30011">Get only actors with names translated to
russian</string>
- <string id="30012">Download posters from KinoPoisk.ru</string>
+ <string id="30100">General</string>
+ <string id="30101">Show also [ORIGINAL TITLE] in search results</string>
+ <string id="30102">Get rating from</string>
+ <string id="30103">Get posters from KinoPoisk.ru</string>
+ <string id="30104">Get only actors with names translated to
russian</string>
+ <string id="30105">Search IMDB ID</string>
+ <string id="30106"> â Search IMDB ID with world premier
year</string>
+ <string id="30107"> â Force searching IMDB ID with google</string>
+ <string id="30108"> â Enable TMDb fanart</string>
+ <string id="30109"> â Add TMDB poster</string>
+
+ <string id="30200">Trailer</string>
+ <string id="30201">Get trailer from KinoPoisk.ru</string>
+ <string id="30202">If trailer and teaser are missing, get any
video</string>
+ <string id="30203">Max HD trailer quality</string>
+ <string id="30204">Max SD trailer quality</string>
+ <string id="30205">Get non-Russian trailer</string>
+ <string id="30250">Don't get</string>
+ <string id="30251">Low</string>
+ <string id="30252">Medium</string>
+ <string id="30253">High</string>
+ <string id="30260">If Russian is missing</string>
+ <string id="30261">If it has better quality</string>
</strings>
diff --git a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
index c9448a1..610c4c1 100644
--- a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
@@ -1,16 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">ÑанаÑÑ Ñ ÑайÑа TMDB</string>
- <string id="30001">оÑигиналÑное название в
ÑезÑлÑÑаÑаÑ
поиÑка</string>
- <string id="30002">ÑкаÑиваÑÑ ÑÑÑÑкоÑзÑÑнÑе
ÑÑейлеÑÑ</string>
- <string id="30003">пÑедпоÑиÑаÑÑ HD каÑеÑÑво</string>
- <string id="30004">пÑедпоÑиÑаемое каÑеÑÑво
ÑÑейлеÑа</string>
- <string id="30005">добавлÑÑÑ Ð½Ðµ ÑÑÑÑкий
ÑÑейлеÑ</string>
- <string id="30006">добавлÑÑÑ Ð¿Ð¾ÑÑÐµÑ Ñ TMDB</string>
- <string id="30007">иÑкаÑÑ IMDB ID</string>
- <string id="30008">иÑкаÑÑ Ð³Ð¾Ð´ пÑемÑеÑÑ Ð´Ð»Ñ IMDB
ID</string>
- <string id="30009">вÑегда иÑполÑзоваÑÑ google длÑ
поиÑка IMDB ID</string>
- <string id="30010">ÑейÑинг KinoPoisk</string>
- <string id="30011">загÑÑжаÑÑ ÑолÑко
пеÑеведÑннÑÑ
акÑÑÑов</string>
- <string id="30012">загÑÑжаÑÑ Ð¿Ð¾ÑÑеÑÑ Ñ ÑайÑа
KinoPoisk.ru</string>
-</strings>
+ <string id="30100">ÐбÑие</string>
+ <string id="30101">ÐобавлÑÑÑ [ÐÐ ÐÐÐÐÐÐЬÐÐÐ
ÐÐÐÐÐÐÐÐ] к ÑезÑлÑÑаÑам поиÑка</string>
+ <string id="30102">ÐÑаÑÑ ÑейÑинг</string>
+ <string id="30103">ÐолÑÑаÑÑ Ð¿Ð¾ÑÑеÑÑ Ñ ÑайÑа
KinoPoisk</string>
+ <string id="30104">ÐÑаÑÑ ÑолÑко акÑеÑов Ñ
пеÑеведеннÑми именами</string>
+ <string id="30105">ÐÑкаÑÑ IMDB ID</string>
+ <string id="30106"> â иÑкаÑÑ IMDB ID иÑполÑзÑÑ
год пÑемÑеÑÑ</string>
+ <string id="30107"> â вÑегда иÑполÑзоваÑÑ google
Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка IMDB ID</string>
+ <string id="30108"> â добавлÑÑÑ ÑанаÑÑ Ñ
TMDB</string>
+ <string id="30109"> â добавлÑÑÑ Ð¿Ð¾ÑÑÐµÑ Ñ
TMDB</string>
+
+ <string id="30200">ТÑейлеÑ</string>
+ <string id="30201">ÐÑаÑÑ ÑÑÐµÐ¹Ð»ÐµÑ Ñ ÑайÑа
KinoPoisk</string>
+ <string id="30202">ÐÑли "ÑÑейлеÑ" и "ÑизеÑ" не
найденÑ, бÑаÑÑ Ð»Ñбой Ñолик</string>
+ <string id="30203">ÐакÑималÑное каÑеÑÑво
HD-Ñоликов</string>
+ <string id="30204">ÐакÑималÑное каÑеÑÑво
SD-Ñоликов</string>
+ <string id="30205">ÐÑаÑÑ Ð½ÐµÑÑÑÑкий Ñолик</string>
+ <string id="30250">Ðе бÑаÑÑ</string>
+ <string id="30251">Ðизкое</string>
+ <string id="30252">СÑеднее</string>
+ <string id="30253">ÐÑÑокое</string>
+ <string id="30260">ÐÑли ÑÑÑÑкий не найден</string>
+ <string id="30261">ÐÑли он в лÑÑÑем каÑеÑÑве,
Ñем ÑÑÑÑкий</string>
+</strings>
\ No newline at end of file
diff --git a/metadata.kinopoisk.ru/resources/settings.xml
b/metadata.kinopoisk.ru/resources/settings.xml
index 5df160d..3fe694a 100644
--- a/metadata.kinopoisk.ru/resources/settings.xml
+++ b/metadata.kinopoisk.ru/resources/settings.xml
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
- <setting label="30012" type="bool" id="posters_from_kinopoisk"
default="true"/>
- <setting type="sep" />
- <setting label="30007" type="bool" id="search_imdb_ID" default="true"/>
- <setting label="30008" type="bool" id="use_world_premier" default="true"
enable="eq(-1,true)"/>
- <setting label="30009" type="bool" id="google_search" default="false"
enable="eq(-2,true)"/>
- <setting label="30000" type="bool" id="fanart" default="true"
enable="eq(-3,true)"/>
- <setting label="30006" type="bool" id="tmdb_poster" default="true"
enable="eq(-4,true)"/>
- <setting type="sep" />
- <setting label="30001" type="bool" id="search_originaltitle"
default="true"/>
- <setting type="sep" />
- <setting label="30010" type="bool" id="kinopoisk_rating" default="false"/>
- <setting type="sep" />
- <setting label="30002" type="bool" id="download_trailer" default="true"/>
- <setting label="30003" type="bool" id="download_hd" default="true"
enable="eq(-1,true)"/>
- <setting label="30004" type="labelenum" values="Low|Medium|High"
id="TrailerQ" default="High" enable="eq(-2,true)"/>
- <setting label="30005" type="bool" id="orig_trailer" default="false"
enable="eq(-3,true)"/>
- <setting type="sep" />
- <setting label="30011" type="bool" id="rus_actor_names" default="false"/>
+ <!-- General -->
+ <category label="30100">
+ <setting label="30101" type="bool" id="search_originaltitle"
default="true"/>
+ <setting label="30102" type="labelenum" values="IMDB|Kinopoisk"
id="RatingSource" default="IMDB"/>
+ <setting label="30103" type="bool" id="posters_from_kinopoisk"
default="true"/>
+ <setting label="30104" type="bool" id="rus_actor_names"
default="false"/>
+ <setting type="sep" />
+ <setting label="30105" type="bool" id="search_imdb_ID"
default="true"/>
+ <setting label="30106" type="bool" id="use_world_premier"
default="true" enable="eq(-1,true)"/>
+ <setting label="30107" type="bool" id="google_search"
default="false" enable="eq(-2,true)"/>
+ <setting label="30108" type="bool" id="fanart" default="true"
enable="eq(-3,true)"/>
+ <setting label="30109" type="bool" id="tmdb_poster"
default="true" enable="eq(-4,true)"/>
+ </category>
+ <category label="30200" >
+ <setting label="30201" type="bool" id="download_trailer"
default="true"/>
+ <setting type="sep"/>
+ <setting label="30202" type="bool" id="GetAnyVideo"
default="true" visible="eq(-2,true)"/>
+ <setting label="30203" type="enum"
lvalues="30250|30251|30252|30253" id="HdTrailerMaxQ" default="2"
visible="eq(-3,true)"/>
+ <setting label="30204" type="enum"
lvalues="30250|30251|30252|30253" id="SdTrailerMaxQ" default="3"
visible="eq(-4,true)"/>
+ <setting label="30205" type="enum" lvalues="30260|30261"
id="TrailerPriority" default="0" visible="eq(-5,true)"/>
+ </category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.kinopoisk.ru/addon.xml | 2 +-
metadata.kinopoisk.ru/addon.xml~ | 28 --
metadata.kinopoisk.ru/changelog.Russian.txt | 12 +
metadata.kinopoisk.ru/changelog.Russian.txt~ | 32 --
metadata.kinopoisk.ru/changelog.txt~ | 69 -----
metadata.kinopoisk.ru/kinopoisk.xml | 311 ++++++++------------
.../resources/language/English/strings.xml | 36 ++-
.../resources/language/Russian/strings.xml | 38 ++-
metadata.kinopoisk.ru/resources/settings.xml | 39 ++--
9 files changed, 200 insertions(+), 367 deletions(-)
delete mode 100644 metadata.kinopoisk.ru/addon.xml~
delete mode 100644 metadata.kinopoisk.ru/changelog.Russian.txt~
delete mode 100644 metadata.kinopoisk.ru/changelog.txt~
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://st.kinopoisk.ru/images/icon-hd2.gif".*?<a](http://st.kinopoisk.ru/images/icon-hd2.gif".*?<a){kind=link}
![http://st.kinopoisk.ru/images/flags/flag-2.gif".*?class="all"[^>]*>](http://st.kinopoisk.ru/images/flags/flag-2.gif".*?class="all"[^>]*>){kind=link}