The branch, dharma has been updated
       via  b63db0b3b17f2b7fcd1953d9e220e76ea181b324 (commit)
      from  3aec3b5324ef380cd7e84d6ca26fe99d10c55869 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=b63db0b3b17f2b7fcd1953d9e220e76ea181b324

commit b63db0b3b17f2b7fcd1953d9e220e76ea181b324
Author: olympia <[email protected]>
Date:   Sat Dec 11 16:46:40 2010 +0100

    [metadata.kinopoisk.ru] updated to version.0.18

diff --git a/metadata.kinopoisk.ru/addon.xml b/metadata.kinopoisk.ru/addon.xml
index a9dc4a6..685ec08 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.17"
+       version="1.0.18"
        provider-name="hamp + akara">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.kinopoisk.ru/changelog.txt 
b/metadata.kinopoisk.ru/changelog.txt
index bf42502..d758ca2 100644
--- a/metadata.kinopoisk.ru/changelog.txt
+++ b/metadata.kinopoisk.ru/changelog.txt
@@ -1,4 +1,7 @@
-1.0.17:
+1.0.18:
+- New search web layout
+- Removed "3D" from movie title
+1.0.17:
 - Fixed russian movie search
 1.0.16:
 - Small fixes in plot parsing
diff --git a/metadata.kinopoisk.ru/kinopoisk.xml 
b/metadata.kinopoisk.ru/kinopoisk.xml
index a5112f4..7746b05 100644
--- a/metadata.kinopoisk.ru/kinopoisk.xml
+++ b/metadata.kinopoisk.ru/kinopoisk.xml
@@ -35,11 +35,11 @@
                                <expression noclean="1" />
                        </RegExp>
                        <!--Êîä åñëè íàéäåíî íåñêîëüêî âàðèàíòîâ-->
-                       <RegExp conditional="!search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
-                               <expression repeat="yes">&lt;a class="all" 
href="/level(.+?)"&gt;(.+?)&lt;/a&gt;,&amp;nbsp;&lt;a[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                       <RegExp conditional="!search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level/1/film/\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
+                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;.+?m_act\[year\]/(\d+)/"&gt;</expression>
                        </RegExp>
-                       <RegExp conditional="search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2 
[\4]&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
-                               <expression repeat="yes">&lt;a class="all" 
href="/level(.+?)"&gt;(.+?)&lt;/a&gt;,&amp;nbsp;&lt;a[^&gt;]*&gt;([^&lt;]*)&lt;.*?color="#999999"&gt;(.*?)&lt;</expression>
+                       <RegExp conditional="search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2 
[\4]&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level/1/film/\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
+                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;.+?m_act\[year\]/(\d+)/"&gt;.*?class="gray"&gt;(?:(?:\d+
 ìèí)|)(.*?)(?:(?:, \d+ ìèí)|)&lt;</expression>
                        </RegExp>
                        <!-- fix html entities from titles-->
                        <RegExp conditional="search_originaltitle" input="$$5" 
output="\1[]&amp;laquo;&amp;raquo;&amp;nbsp;" dest="5">
@@ -111,6 +111,9 @@
                        <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="&lt;country&gt;\1&lt;/country&gt;" dest="5+">
                                <expression repeat="yes">&lt;a 
href="/level/10/m_act%5Bcountry%5D/.+?/"&gt;&lt;img 
src="/images/flags/flag.*?alt="(.*?)"</expression>
@@ -252,6 +255,9 @@
        <GMP dest="4">
                <RegExp input="$$8" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4+">
                        <RegExp input="$$1" output="&lt;thumb 
preview=&quot;http://www.kinopoisk.ru/images/poster/sm_\1&quot;&gt;http://www.kinopoisk.ru/images/poster/\1&lt;/thumb&gt;";
 dest="8+">
+                               <expression repeat="yes" noclean="1">&lt;a 
href="/picture/[0-9]+/"&gt;&lt;img class="new" src="/images/poster/sm_([^"]+)" 
width</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;thumb 
preview=&quot;http://www.kinopoisk.ru/images/poster/sm_\1&quot;&gt;http://www.kinopoisk.ru/images/poster/\1&lt;/thumb&gt;";
 dest="8+">
                                <expression repeat="yes" noclean="1">&lt;a 
href="/picture/[0-9]+/"&gt;&lt;img  src="/images/poster/sm_([^"]+)" 
width</expression>
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="7">
@@ -630,6 +636,9 @@
                <RegExp conditional="!use_world_premier" input="none" 
output="$$14" dest="18">
                        <expression/>
                </RegExp>
+               <RegExp input="$$15" output="0" dest="15">
+                       <expression>^$</expression>
+               </RegExp>
                <RegExp input="none" output="$$15:::$$18:::$$19" dest="20">
                        <expression/>
                </RegExp>
@@ -687,6 +696,9 @@
                                <expression noclean="1">(.*?), The$</expression>
                        </RegExp>
                        <RegExp input="$$11" output="\1" dest="11">
+                               <expression noclean="1">(.*?) â 3D$</expression>
+                       </RegExp>
+                       <RegExp input="$$11" output="\1" dest="11">
                                <expression noclean="1">(.*?) 3D$</expression>
                        </RegExp>
                        <!-- fixchars by design convert all data to 
SearchStringEncoding http://trac.xbmc.org/ticket/10497

-----------------------------------------------------------------------

Summary of changes:
 metadata.kinopoisk.ru/addon.xml     |    2 +-
 metadata.kinopoisk.ru/changelog.txt |    5 ++++-
 metadata.kinopoisk.ru/kinopoisk.xml |   20 ++++++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages, 
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev 
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to