', '
') + self.title = gutils.trim(gutils.trim(self.page, 'property="og:title"', '>'), '"', '"') def get_director(self): - self.director = gutils.clean(gutils.trim(self.page_cast, u'Réalisé par :', ''))
+ self.director = gutils.clean(gutils.trim(self.page, u'Réalisé par', ''))
self.director = re.sub('[\n|\t]+', ', ', self.director)
def get_plot(self):
- self.plot = gutils.trim(gutils.after(self.page, '>L\'histoire<'), '
'), '>')
def get_year(self):
- self.year = gutils.trim(self.page, 'Date(s) de Sortie(s)', '')
- if len(self.year) > 4:
- self.year = self.year[len(self.year) - 4:len(self.year)]
+ self.year = gutils.trim(gutils.trim(self.page, 'Date de sortie :', ''), 'content="', '-')
def get_runtime(self):
- self.runtime = gutils.clean(gutils.trim(self.page, u'>Durée :', ''))
+ self.runtime = gutils.clean(gutils.trim(self.page, u'Durée : ', ''))
if self.runtime:
- if self.runtime.find('h') > 0:
- self.runtime = str (int(gutils.before(self.runtime,'h'))*60 + int(gutils.after(self.runtime,'h')))
+ if self.runtime.find('H') > 0:
+ self.runtime = str (int(gutils.before(self.runtime,'H'))*60 + int(gutils.after(self.runtime,'H')))
else:
self.runtime = gutils.before(self.runtime,' mn')
def get_genre(self):
- self.genre = gutils.trim(self.page, 'Genre :', '')
+ self.genre = gutils.trim(self.page, 'Genre :', '')
self.genre = re.sub('[,][^,]*$', '', self.genre)
self.genre = self.genre.replace(',', ', ')
def get_cast(self):
- self.cast = gutils.trim(self.page_cast, u'Comédiens :', '', '
')
+ self.plot = gutils.after(gutils.trim(self.page, 'class="synopsis"', '')
- self.cast = self.cast.replace('\n', '')
- self.cast = self.cast.replace('', '\n')
- self.cast = re.sub('', _(' as '), self.cast)
- self.cast = gutils.clean(self.cast)
- self.cast = re.sub(_(' as ') + '[ \t]*(\n|$)', '\n', self.cast)
- self.cast = re.sub('[ \t]*\n[ \t]+', '\n', self.cast)
+ self.cast = ''
+ tmp = self.page.split('itemprop="actor"')
+ for element in tmp[1:]:
+ actor = gutils.trim(element, '>', '')
+ role = gutils.after(gutils.trim(element, u'Rôle', ''), ': ')
+ if role:
+ self.cast = self.cast + actor + _(' as ') + role + '\n'
+ else:
+ self.cast = self.cast + actor + '\n'
def get_classification(self):
# not available on this site
self.classification = ''
def get_studio(self):
- self.studio = string.strip(gutils.trim(self.page, 'Distributeur :', ''))
+ self.studio = string.strip(gutils.trim(self.page, 'Distributeur :', ''))
def get_o_site(self):
self.o_site = gutils.after(gutils.after(gutils.trim(self.page, '>Site(s) Officiel(s)<', '')
@@ -108,35 +106,33 @@
self.rating = gutils.clean(gutils.trim(self.page, '
', '
'))
def get_screenplay(self):
- self.screenplay = gutils.clean(gutils.trim(self.page_cast, u'Scénario de :', ''))
+ self.screenplay = gutils.clean(gutils.trim(self.page, u'Scénario de :', '
'))
self.screenplay = re.sub('[\n|\t]+', ', ', self.screenplay)
class SearchPlugin(movie.SearchMovie):
def __init__(self):
- self.encode = 'iso-8859-1'
- self.original_url_search = "http://www.cinemovies.fr/resultat_recherche.php?typsearch=11&cherche="
- self.translated_url_search = "http://www.cinemovies.fr/resultat_recherche.php?typsearch=11&cherche="
+ self.encode = 'utf-8'
+ self.original_url_search = 'http://www.cinemovies.fr/rechercher/?e=m&page=1&q='
+ self.translated_url_search = 'http://www.cinemovies.fr/rechercher/?e=m&page=1&q='
def search(self,parent_window):
if not self.open_search(parent_window):
return None
- self.sub_search()
return self.page
- def sub_search(self):
- self.page = gutils.trim(self.page, '
Les film', '
')
-
def get_searches(self):
- elements = string.split(self.page, ''), '>')))
- year = gutils.after(gutils.trim(element, ''), '>')
- self.titles.append(title + ' (' + year + ')')
+ id = gutils.before(element, '"')
+ title = gutils.clean(gutils.trim(element, '>', '<'))
+ if id and title:
+ self.ids.append(id)
+ year = gutils.trim(element, '">Sortie le', '<')
+ self.titles.append(title + ' (' + year + ')')
else:
self.number_results = 0
@@ -149,7 +145,7 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky Balboa' : [ 2, 2 ],
+ 'Rocky Balboa' : [ 4, 4 ],
}
class PluginTest:
@@ -161,7 +157,7 @@
# * or the expected value
#
test_configuration = {
- '6065' : {
+ 'rocky-balboa_e54849' : {
'title' : 'Rocky Balboa',
'o_title' : 'Rocky VI',
'director' : 'Sylvester Stallone',
@@ -186,7 +182,7 @@
'classification' : False,
'studio' : 'Twentieth Century Fox France',
'o_site' : 'http://www.sonypictures.com/movies/rocky/',
- 'site' : 'http://www.cinemovies.fr/fiche_film.php?IDfilm=6065',
+ 'site' : 'http://www.cinemovies.fr/film/rocky-balboa_e54849',
'trailer' : 'http://www.cinemovies.fr/fiche_multimedia.php?IDfilm=6065',
'year' : 2007,
'notes' : False,
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieCineteka.py trunk/lib/plugins/movie/PluginMovieCineteka.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieCineteka.py 2011-08-31 09:40:41.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieCineteka.py 2013-07-27 18:37:05.676881075 +0300
@@ -134,7 +134,7 @@
class SearchPlugin(movie.SearchMovie):
"""A movie search object"""
def __init__(self):
- self.original_url_search = "http://www.cineteka.com/index.php?op=MovieSearch&s="
+ self.original_url_search = "http://www.cineteka.com/index.php?op=MovieSearch&perfil_display=0&ordby=3&s="
self.translated_url_search = self.original_url_search
self.encode = 'iso-8859-1'
@@ -142,7 +142,7 @@
"""Perform the web search"""
if not self.open_search(parent_window):
return None
- self.page = gutils.trim(self.page, 'tulo(s): ', '
')
+ self.page = gutils.after(self.page, '"Resultados Ordenados por:"')
return self.page
def get_searches(self):
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieDVDEmpire.py trunk/lib/plugins/movie/PluginMovieDVDEmpire.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieDVDEmpire.py 2009-12-08 23:53:02.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieDVDEmpire.py 2013-07-27 18:37:05.670214115 +0300
@@ -1,6 +1,6 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieDVDEmpire.py 1327 2009-12-08 20:38:46Z mikej06 $'
+__revision__ = '$Id: PluginMovieDVDEmpire.py 1650 2013-06-26 20:59:58Z mikej06 $'
# Copyright (c) 2007-2009
#
@@ -24,6 +24,7 @@
import gutils
import movie
import re
+import string
plugin_name = "DVD Empire"
plugin_description = "International Retailer of DVD Movies"
@@ -31,57 +32,68 @@
plugin_language = _("English")
plugin_author = "Michael Jahn"
plugin_author_email = ""
-plugin_version = "1.1"
+plugin_version = "1.2"
class Plugin(movie.Movie):
def __init__(self, id):
self.encode = 'iso-8859-1'
self.movie_id = id
- self.url = "http://www.dvdempire.com/Exec/v4_item.asp?item_id=" + str(self.movie_id)
+ self.url = "http://www.dvdempire.com" + str(self.movie_id)
def get_image(self):
- tmp_page = gutils.trim(self.page, '', ' ')
- self.image_url = gutils.trim(tmp_page, '
')
+ self.image_url = gutils.trim(tmp_page, 'href="', '"')
def get_o_title(self):
- self.o_title = gutils.strip_tags(gutils.trim(self.page,'', ''))
+ self.o_title = gutils.strip_tags(gutils.trim(self.page, '', '('))
def get_title(self):
- self.title = gutils.strip_tags(gutils.trim(self.page,'<td class="fontxlarge" valign="top" align="left">', '<nobr>'))
+ self.title = gutils.strip_tags(gutils.trim(self.page, '<title>', '('))
def get_director(self):
- self.director = gutils.strip_tags(gutils.trim(self.page,">Directors:","</a>"))
+ self.director = gutils.trim(self.page, '<h3>Director</h3>', '</div>')
+ self.director = self.director.replace('</li><li', '</li>, <li')
self.director = self.director.replace(' ', '')
self.director = self.director.replace('•', '')
def get_plot(self):
- self.plot = gutils.strip_tags(gutils.trim(self.page, '<td width="100%" valign="top" class="fontsmall3">', '</td>'))
+ self.plot = gutils.strip_tags(gutils.trim(self.page, 'Synopsis</h2>', '</div>'))
self.plot = self.plot.replace(u'\x93', '"')
self.plot = self.plot.replace(u'\x84', '"')
def get_year(self):
- self.year = gutils.strip_tags(gutils.trim(self.page, '>Production Year:', '<br />'))
+ self.year = gutils.strip_tags(gutils.after(gutils.trim(self.page, 'Production Year', '<br'), '>'))
def get_runtime(self):
- self.runtime = gutils.strip_tags(gutils.trim(self.page, '>Length:', '<br />'))
+ self.runtime = ''
+ tmp = gutils.strip_tags(gutils.trim(self.page, 'Length', '<br'))
+ #1 hrs. 59 mins.
+ try:
+ self.runtime = int(gutils.before(tmp, 'hrs')) * 60 + int(gutils.trim(tmp, '.', 'mins'))
+ except:
+ self.runtime = ''
def get_genre(self):
- self.genre = gutils.strip_tags(gutils.trim(self.page, '>Genre</b>:', '</tr>'))
+ tmp = gutils.strip_tags(gutils.trim(self.page, '<h2>Categories</h2>', '</p>'))
+ tmp = tmp.replace('\r\n', '')
+ self.genre = re.sub('[ \t]+', ' ', tmp)
def get_cast(self):
- self.cast = gutils.trim(self.page, '>Actors:', '</td><td')
+ self.cast = gutils.trim(self.page, '<h3>Cast</h3>', '</div>')
self.cast = self.cast.replace('<br>', '\n')
self.cast = self.cast.replace('<br />', '\n')
self.cast = self.cast.replace(' ', '')
self.cast = self.cast.replace('•', '')
self.cast = self.cast.replace('•', '')
+ self.cast = self.cast.replace('</li><li', '</li>\n<li')
+ self.cast = self.cast.replace('</li><!-- non-headliners --><li', '</li>\n<li')
self.cast = gutils.strip_tags(self.cast)
def get_classification(self):
- self.classification = gutils.strip_tags(gutils.trim(self.page, '>Rating:', '<br />'))
+ self.classification = gutils.strip_tags(gutils.trim(self.page, 'Rating</strong>', '<br'))
def get_studio(self):
- self.studio = gutils.strip_tags(gutils.trim(self.page, '>Studio:', '<br />'))
+ self.studio = gutils.strip_tags(gutils.trim(self.page, 'Studio</strong>', '<br'))
def get_o_site(self):
self.o_site = ""
@@ -96,7 +108,7 @@
self.country = ""
def get_rating(self):
- self.rating = gutils.clean(gutils.trim(self.page, '>Overall Rating:', ' out of'))
+ self.rating = gutils.clean(gutils.trim(self.page, 'Overall Rating:', ' out of'))
try:
tmp_float = float(self.rating)
tmp_float = round(2 * tmp_float, 0)
@@ -106,90 +118,65 @@
def get_notes(self):
self.notes = ''
- tmp_page = gutils.trim(self.page, 'Features:', '<b>')
+ tmp_page = gutils.trim(self.page, '<h3>Features</h3>', '</p>')
tmp_page = tmp_page.replace('<br>', '\n')
tmp_page = tmp_page.replace('<br />', '\n')
tmp_page = gutils.strip_tags(tmp_page)
if tmp_page <> '':
- tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
- self.notes = self.notes + '\nFeatures:' + tmp_page + '\n'
- tmp_page = gutils.trim(self.page, 'Video:', '<b>')
+ self.notes = self.notes + 'Features:\n' + tmp_page + '\n\n'
+ tmp_page = gutils.trim(self.page, 'Video</strong>', '<strong>')
+ tmp_page = tmp_page.replace('\r\n', '')
+ tmp_page = re.sub('[ \t]+', ' ', tmp_page)
tmp_page = tmp_page.replace('<br>', '\n')
tmp_page = tmp_page.replace('<br />', '\n')
tmp_page = gutils.strip_tags(tmp_page)
if tmp_page <> '':
- tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
- self.notes = self.notes + '\nVideo:' + tmp_page + '\n'
- tmp_page = gutils.trim(self.page, 'Audio:', '<b>')
+ self.notes = self.notes + 'Video:' + tmp_page
+ tmp_page = gutils.trim(self.page, 'Audio</strong>', '</div>')
+ tmp_page = tmp_page.replace('\r\n', '')
+ tmp_page = re.sub('[ \t]+', ' ', tmp_page)
tmp_page = tmp_page.replace('<br>', '\n')
tmp_page = tmp_page.replace('<br />', '\n')
tmp_page = tmp_page.replace('(more info)', '\n')
tmp_page = gutils.strip_tags(tmp_page)
if tmp_page <> '':
- tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
- self.notes = self.notes + '\nAudio:' + tmp_page
- tmp_page = gutils.trim(self.page, 'Subtitles:', '<b>')
- tmp_page = gutils.strip_tags(tmp_page)
- if tmp_page <> '':
- tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
- self.notes = self.notes + '\nSubtitles:\n' + tmp_page + '\n'
+ self.notes = self.notes + 'Audio:' + tmp_page
def get_screenplay(self):
- self.screenplay = gutils.strip_tags(gutils.trim(self.page, '>Writers:', '</a>'))
+ self.screenplay = gutils.strip_tags(gutils.trim(self.page, 'Writers</strong>', '<br'))
self.screenplay = self.screenplay.replace(' ', '')
self.screenplay = self.screenplay.replace('•', '')
def get_barcode(self):
- self.barcode = gutils.trim(self.page, '<b>UPC Code:</b>', '<')
+ self.barcode = gutils.trim(self.page, 'UPC Code</strong>', '<br')
+
class SearchPlugin(movie.SearchMovie):
def __init__(self):
- self.original_url_search = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&string="
- self.translated_url_search = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&string="
+ self.original_url_search = "http://www.dvdempire.com/allsearch/search?pageSize=100&q="
+ self.translated_url_search = "http://www.dvdempire.com/allsearch/search?pageSize=100&q="
self.encode = 'iso-8859-1'
def search(self,parent_window):
if not self.open_search(parent_window):
return None
- # short the content
- tmp_page = gutils.trim(self.page,'<select name="sort"', 'Click Here to make a Suggestion</a>')
- #
- # try to get all result pages (not so nice, but it works)
- #
- tmp_pagecount = gutils.trim(self.page, '<div id="Search_Container" name="Search_Container">', '</table>')
- tmp_pagecountintuse = 1
- elements = tmp_pagecount.split("&page=")
- for element in elements:
- try:
- tmp_pagecountint = int(gutils.before(element, '\''))
- except:
- tmp_pagecountint = 0
- if tmp_pagecountint > tmp_pagecountintuse:
- tmp_pagecountintuse = tmp_pagecountint
- tmp_pagecountintcurrent = 1
- while tmp_pagecountintuse > tmp_pagecountintcurrent and tmp_pagecountintuse < 4:
- tmp_pagecountintcurrent = tmp_pagecountintcurrent + 1
- self.url = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&page=" + str(tmp_pagecountintcurrent) + "&string="
- self.open_search(parent_window)
- if self.open_search(parent_window):
- tmp_page2 = gutils.trim(self.page,'<select name="sort"', 'Click Here to make a Suggestion</a>')
- tmp_page = tmp_page + tmp_page2
-
- self.page = tmp_page
return self.page
def get_searches(self):
- split_pattern = re.compile('<a[\t ]+href=["\']/Exec/v4_item[.]asp[?](?:userid=[-0-9]+[&]amp;)*item_id=([0-9]+)\'')
+ split_pattern = re.compile('class="title"')
elements = split_pattern.split(self.page)
- for index in range(1, len(elements), 2):
- title_element = elements[index + 1]
- tmp_title = gutils.strip_tags(gutils.trim(title_element, '>', '</a>'))
+ for index in range(1, len(elements), 1):
+ title_element = elements[index]
+ tmp_title = gutils.clean(gutils.strip_tags(gutils.trim(title_element, '>', '</a>')))
+ tmp_title = string.replace(tmp_title, ' ', ' ')
+ tmp_title = string.replace(tmp_title, '&', '&')
+ tmp_title = string.replace(tmp_title, '"', '"')
if tmp_title <> '':
- self.ids.append(elements[index])
- type = re.search('<b>Blu-ray</b>', title_element)
+ self.ids.append(gutils.trim(elements[index], 'href="', '"'))
+ type = re.search('>Blu-ray</span>', title_element)
if type:
tmp_title = tmp_title + ' (Blu-ray)'
- type = re.search('<b>DVD-Video</b>', title_element)
+ type = re.search('>DVD-Video</span>', title_element)
if type:
tmp_title = tmp_title + ' (DVD)'
self.titles.append(tmp_title)
@@ -203,7 +190,7 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky Balboa' : [ 2, 2 ],
+ 'Rocky Balboa' : [ 30, 30 ],
}
class PluginTest:
@@ -215,45 +202,45 @@
# * or the expected value
#
test_configuration = {
- '1300280' : {
- 'title' : 'Rocky Balboa',
- 'o_title' : 'Rocky Balboa',
- 'director' : 'Sylvester Stallone',
+ '/1402424/meet-the-spartans-unrated-pit-of-death-edition-blu-ray.html' : {
+ 'title' : 'Meet The Spartans: Unrated Pit Of Death Edition',
+ 'o_title' : 'Meet The Spartans: Unrated Pit Of Death Edition',
+ 'director' : 'Jason Friedberg, Aaron Seltzer',
'plot' : True,
- 'cast' : 'Sylvester Stallone\n\
-Burt Young\n\
-Geraldine Hughes\n\
-Milo Ventimiglia\n\
-Antonio Tarver',
+ 'cast' : 'Carmen Electra\n\
+Sean Maguire\n\
+Ken Davitian',
'country' : False,
- 'genre' : 'Sports, Boxing, Drama',
- 'classification' : 'PG',
- 'studio' : 'Sony Pictures Home Entertainment',
+ 'genre' : 'Blu-ray, Comedy, Movies, Spoofs & Parodies',
+ 'classification' : 'NR',
+ 'studio' : '20th Century Fox',
'o_site' : False,
- 'site' : 'http://www.dvdempire.com/Exec/v4_item.asp?item_id=1300280',
+ 'site' : 'http://www.dvdempire.com/1402424/meet-the-spartans-unrated-pit-of-death-edition-blu-ray.html',
'trailer' : False,
- 'year' : 2006,
+ 'year' : 2008,
'notes' : 'Features:\n\
-Deleted Scenes & Alternate Ending\n\
-Boxing\'s Bloopers\n\
-Skill Vs. Will: The Making of Rocky Balboa\n\
-Reality in the Ring: Filming Rocky\'s Final Fight\n\
-Virtual Champion: Creating the Computer Fight\n\
-Audio Commentary with Sylvester Stallone\n\
+Audio Commentary By Cast And Crew\n\
+Prepare For Thrusting Featurette\n\
+Tour The Set With Ike Barinholtz Featurette\n\
+Gag Reel\n\
+Know Your Spartans Pop Culture Trivia Game\n\
+Celebrity Kickoff Game\n\
+Super Pit-Of-Death Ultimate Tactical Battle Challange Game\n\
+Meet The Spartans: The Music\n\
+Trivial Track\n\
+Theatrical Trailers\n\
\n\
Video:\n\
-Widescreen 1.85:1 Color (Anamorphic) \n\
-\n\
-Audio: \n\
-ENGLISH: Dolby Digital 5.1 [CC]\n\
-FRENCH: Dolby Digital 5.1\n\
+ Widescreen 1.85:1 Color \n\
\n\
-Subtitles:\n\
-English, Spanish, French',
- 'runtime' : 102,
+Audio:\n\
+ French Dolby Digital Surround \n\
+ Spanish Dolby Digital Surround \n\
+ English DTS-HD MA 5.1',
+ 'runtime' : 87,
'image' : True,
- 'rating' : 9,
- 'screenplay' : 'Sylvester Stallone',
- 'barcode' : '043396161900'
+ 'rating' : 5,
+ 'screenplay' : False,
+ 'barcode' : '024543522614'
},
}
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieDVDPalace.py trunk/lib/plugins/movie/PluginMovieDVDPalace.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieDVDPalace.py 2010-03-18 15:19:24.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieDVDPalace.py 2013-07-27 18:37:05.676881075 +0300
@@ -1,8 +1,8 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieDVDPalace.py 1409 2010-03-12 21:22:28Z mikej06 $'
+__revision__ = '$Id: PluginMovieDVDPalace.py 1626 2012-07-03 20:45:58Z mikej06 $'
-# Copyright (c) 2006-2009
+# Copyright (c) 2006-2012
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,14 +32,14 @@
plugin_language = _("German")
plugin_author = "Michael Jahn"
plugin_author_email = "<mikej06@hotmail.com>"
-plugin_version = "1.2"
+plugin_version = "1.3"
class Plugin(movie.Movie):
def __init__(self, id):
self.encode = 'iso-8859-1'
self.movie_id = id
- self.url = 'http://www.dvd-palace.de/dvd-datenbank/' + self.movie_id
+ self.url = 'http://www.dvd-palace.de/datenbank/medien/' + self.movie_id
def get_image(self):
self.image_url = gutils.trim(self.page, 'src="/showcover.php?', '"')
@@ -85,7 +85,9 @@
self.classification = string.replace(gutils.trim(self.page, 'Altersfreigabe (FSK)', '</TR>'), ' ', '')
def get_studio(self):
- self.studio = string.replace(string.replace(gutils.trim(self.page, 'Label', '</td>'), ' ', ''), ':', '')
+ self.studio = string.replace(string.replace(gutils.trim(self.page, 'Label</b>', '</td>'), ' ', ''), ':', '')
+ if not self.studio:
+ self.studio = string.replace(string.replace(gutils.trim(self.page, 'Vertrieb</b>', '</td>'), ' ', ''), ':', '')
def get_o_site(self):
self.o_site = ""
@@ -132,14 +134,34 @@
if (tmp_notes != ""):
self.notes = self.notes + "Untertitel:" + tmp_notes + "\n\n"
+ def get_barcode(self):
+ self.barcode = gutils.trim(self.page, 'EAN', '</b>')
+
+
class SearchPlugin(movie.SearchMovie):
+ translations = (
+ ('ü', 'ue'),
+ ('ä', 'ae'),
+ ('ö', 'oe'),
+ ('Ü', 'UE'),
+ ('Ä', 'AE'),
+ ('Ö', 'OE'),
+ ('ß', 'ss')
+ )
+
def __init__(self):
self.original_url_search = "http://www.dvd-palace.de/dvddatabase/dbsearch.php?action=1&suchbegriff="
self.translated_url_search = "http://www.dvd-palace.de/dvddatabase/dbsearch.php?action=1&suchbegriff="
self.encode='iso-8859-1'
+ self.remove_accents = False
def search(self,parent_window):
+ # replace some standard german umlauts
+ for from_str, to_str in self.translations:
+ self.title = self.title.replace(from_str, to_str)
+ # AFTER that remove accents
+ self.title = gutils.remove_accents(str(self.title))
if not self.open_search(parent_window):
return None
tmp_pagemovie = self.page
@@ -161,16 +183,17 @@
return self.page
def get_searches(self):
- elements = re.split(' <a title="[^"]+" href="(/dvd-datenbank/|/datenbank/blu-ray/)', self.page)
+ elements = re.split(' <a title="[^"]+" href="(/datenbank/medien/dvd/|/datenbank/medien/blu-ray/)', self.page)
elements[0] = None
for index in range(1, len(elements), 2):
element = elements[index + 1]
- if elements[index] == '/datenbank/blu-ray/':
- medium = 'Blu-Ray'
- else:
- medium = 'DVD'
if element <> None:
- self.ids.append(gutils.before(element,'"'))
+ if elements[index] == '/datenbank/medien/blu-ray/':
+ medium = 'Blu-Ray'
+ self.ids.append('blu-ray/' + gutils.before(element,'"'))
+ else:
+ medium = 'DVD'
+ self.ids.append('dvd/' + gutils.before(element,'"'))
self.titles.append(
gutils.trim(element, '>', '</a>') +
gutils.clean(
Only in trunk/lib/plugins/movie: PluginMovieDVDpt.py
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieE-Pipoca.py trunk/lib/plugins/movie/PluginMovieE-Pipoca.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieE-Pipoca.py 2011-05-18 20:11:58.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieE-Pipoca.py 2013-07-27 18:37:05.673547595 +0300
@@ -1,6 +1,6 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieE-Pipoca.py 1548 2011-05-18 11:36:17Z mikej06 $'
+__revision__ = '$Id: PluginMovieE-Pipoca.py 1633 2012-12-28 23:11:42Z mikej06 $'
# Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
#
@@ -242,7 +242,7 @@
Kevin King Templeton' + _(' as ') + 'Amigo de Robert\n\
Robert Michael Kelly' + _(' as ') + 'Senhor Tomilson\n\
Rick Buchborn' + _(' as ') + 'Fã de Rocky\n\
-Nick Baker' + _(' as ') + 'Bartender do pub irlandês\n\
+Nick Baker (1)' + _(' as ') + 'Bartender do pub irlandês\n\
Don Sherman' + _(' as ') + 'Andy\n\
Stu Nahan' + _(' as ') + 'Comentarista da luta pelo computador\n\
Gary Compton' + _(' as ') + 'Segurança\n\
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmAffinity.py trunk/lib/plugins/movie/PluginMovieFilmAffinity.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmAffinity.py 2011-12-04 17:59:11.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieFilmAffinity.py 2013-07-27 18:37:05.676881075 +0300
@@ -51,43 +51,41 @@
self.image_url = 'http://' + gutils.before(self.page[tmp.start():], '"')
def get_o_title(self):
- self.o_title = gutils.trim(self.page, u'<th>TÍTULO ORIGINAL</th>', '</strong></td>')
- self.o_title = gutils.after(self.o_title, '<strong>')
+ self.o_title = gutils.trim(self.page, u'<dt>Título original</dt>', '</dd>')
self.o_title = re.sub('[ ]+', ' ', self.o_title)
self.o_title = re.sub('([(]Serie de TV[)]|[(]TV[)]|[(]TV Series[)])', '', self.o_title)
def get_title(self):
- self.title = gutils.trim(self.page, 'www.filmaffinity.com/images/movie.gif" border="0"> ', '</span>')
+ self.title = gutils.after(gutils.trim(self.page, 'id="main-title"', '</a>'), '>')
self.title = re.sub('[ ]+', ' ', self.title)
self.title = re.sub('([(]Serie de TV[)]|[(]TV[)]|[(]TV Series[)])', '', self.title)
def get_director(self):
- self.director = gutils.trim(self.page,'<th>DIRECTOR</th>', '</td>')
+ self.director = gutils.trim(self.page,'<dt>Director</dt>', '</dd>')
def get_plot(self):
- self.plot = gutils.trim(self.page, '<th>SINOPSIS</th>', '</td>')
+ self.plot = gutils.trim(self.page, '<dt>Sinopsis</dt>', '</dd>')
self.plot = string.replace(self.plot, ' (FILMAFFINITY)', '')
self.plot = string.replace(self.plot, '(FILMAFFINITY)', '')
def get_year(self):
- self.year = gutils.trim(self.page, '<th>AÑO</th>', '</td>')
+ self.year = gutils.trim(self.page, '<dt>Año</dt>', '</dd>')
self.year = gutils.clean(self.year)
def get_runtime(self):
- self.runtime = gutils.trim(self.page, '<th>DURACIÓN</th>', ' min.')
- self.runtime = gutils.after(self.runtime[-10:], '<td>')
+ self.runtime = gutils.trim(self.page, '<dt>Duración</dt>', 'min.')
+ self.runtime = gutils.clean(self.runtime)
def get_genre(self):
self.genre = ''
- tmp = gutils.trim(self.page, '<th>GÉNERO</th>', '</tr>')
- tmp = gutils.after(tmp, '<td>')
+ tmp = gutils.trim(self.page, '<dt>Género</dt>', '</dd>')
if tmp:
self.genre = gutils.clean(string.replace(tmp, ' | ', '. '))
self.genre = re.sub('[.][ \t]+', '. ', self.genre)
def get_cast(self):
self.cast = ''
- self.cast = gutils.trim(self.page, '<th>REPARTO</th>', '</td>')
+ self.cast = gutils.trim(self.page, '<dt>Reparto</dt>', '</dd>')
self.cast = re.sub('</a>,[ ]*', '\n', self.cast)
self.cast = string.strip(gutils.strip_tags(self.cast))
self.cast = re.sub('[ ]+', ' ', self.cast)
@@ -97,11 +95,10 @@
self.classification = ''
def get_studio(self):
- self.studio = gutils.trim(self.page, '<th>PRODUCTORA</th>', '</td>')
- self.studio = gutils.after(self.studio, '<td>')
+ self.studio = gutils.trim(self.page, '<dt>Productora</dt>', '</dd>')
def get_o_site(self):
- self.o_site = gutils.trim(self.page, '<th>WEB OFICIAL</th>', '</a>')
+ self.o_site = gutils.trim(self.page, '<dt>Web Oficial</dt>', '</a>')
self.o_site = gutils.after(self.o_site, '">')
def get_site(self):
@@ -111,23 +108,19 @@
self.trailer = ''
def get_country(self):
- self.country = gutils.trim(self.page, '<b>PAÍS</th>', '</td>')
- tmp = gutils.trim(self.country, 'alt="', '"')
- if tmp == '':
- self.country = gutils.trim(self.country, 'title="', '"')
- else:
- self.country = tmp
+ self.country = gutils.trim(self.page, '<dt>País</dt>', '</dd>')
def get_rating(self):
- self.rating = gutils.trim(self.page, '<div style="margin: 4px 0; color:#990000; font-size:22px; font-weight: bold;">', '</div>')
+ self.rating = gutils.after(gutils.trim(self.page, 'id="movie-rat-avg"', '</div>'), '>')
if self.rating:
self.rating = str(round(float(gutils.clean(string.replace(self.rating, ',', '.')))))
def get_cameraman(self):
- self.cameraman = gutils.trim(self.page, '<th>FOTOGRAFÍA</th>','</td>')
+ self.cameraman = gutils.trim(self.page, '<dt>Fotografía</dt>','</dd>')
def get_screenplay(self):
- self.screenplay = gutils.trim(self.page, '<th>GUIÓN</th>', '</td>')
+ self.screenplay = gutils.trim(self.page, '<dt>Guión</dt>', '</dd>')
+
class SearchPlugin(movie.SearchMovie):
@@ -143,17 +136,17 @@
self.sub_search(parent_window)
if self.page <> '':
return self.page
- auxPage = gutils.trim(auxPage, u'<b>TU CRTICA</b></div>', '</a>')
- self.page = gutils.trim(auxPage, 'movie_id=', '">')
+ auxPage = gutils.trim(auxPage, 'id="main-title"', '</a>')
+ self.page = gutils.trim(auxPage, 'es/film', '.html')
return self.page
def sub_search(self, parent_window):
- moviepage = gutils.trim(self.page, u'Resultados por ttulo</span>', '<div id="bpanel">')
+ moviepage = gutils.trim(self.page, u'Resultados Por Ttulo</h1>', '<div id="bpanel">')
nextpage = self.get_nextpage_url()
while nextpage:
self.url = nextpage
self.open_search(parent_window)
- moviepage = moviepage + gutils.trim(self.page, u'Resultados por ttulo</span>', '<div id="bpanel">')
+ moviepage = moviepage + gutils.trim(self.page, u'Resultados Por Ttulo</h1>', '<div id="bpanel">')
nextpage = self.get_nextpage_url()
self.page = moviepage
@@ -173,18 +166,13 @@
self.ids.append(self.page)
self.titles.append(self.url)
else: # multiple matches
- elements = string.split(self.page, '</a></b>')
-
- if (elements[0]<>''):
- for index in range(0, len(elements) - 1, 1):
- element = elements[index]
- nextelement = elements[index + 1]
- id = gutils.trim(element, '<b><a href="/es/film', '.html')
- if id:
- self.ids.append(id)
- title = gutils.clean(gutils.after(element, '<b><a href="/es/film')).replace("\n", "")
- title = gutils.strip_tags(gutils.convert_entities(gutils.after(title, '>'))) + ' ' + string.strip(gutils.before(nextelement, '<'))
- self.titles.append(title)
+ elements = string.split(self.page, 'class="mc-title"')
+ for element in elements[1:]:
+ id = gutils.trim(element, 'href="/es/film', '.html')
+ title = gutils.clean(gutils.trim(element, '>', '</div>'))
+ if id:
+ self.ids.append(id)
+ self.titles.append(title)
#
# Plugin Test
@@ -195,8 +183,8 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky' : [ 17, 17 ],
- 'Darkness' : [59, 59 ]
+ 'Rocky' : [ 18, 18 ],
+ 'Darkness' : [74, 74 ]
}
class PluginTest:
@@ -220,7 +208,6 @@
Milo Ventimiglia\n\
Tony Burton\n\
James Francis Kelly III\n\
-Talia Shire\n\
Angela Boyd\n\
A.J. Benza\n\
Mike Tyson',
Only in ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie: PluginMovieFilmDb.py
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmeVonAZ.py trunk/lib/plugins/movie/PluginMovieFilmeVonAZ.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmeVonAZ.py 2010-07-18 22:23:16.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieFilmeVonAZ.py 2013-07-27 18:37:05.666880634 +0300
@@ -1,8 +1,8 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieFilmeVonAZ.py 1437 2010-07-18 11:37:02Z mikej06 $'
+__revision__ = '$Id: PluginMovieFilmeVonAZ.py 1640 2013-01-30 11:51:51Z mikej06 $'
-# Copyright (c) 2006-2010 Michael Jahn
+# Copyright (c) 2006-2013 Michael Jahn
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
plugin_language = _("German")
plugin_author = "Michael Jahn"
plugin_author_email = "<mikej06@hotmail.com>"
-plugin_version = "1.4"
+plugin_version = "1.5"
class Plugin(movie.Movie):
def __init__(self, id):
@@ -40,64 +40,50 @@
self.movie_id = id
self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=titel&wert=' + str(self.movie_id)
- def initialize(self):
- url = 'http://www.zweitausendeins.de/getimage/?imageNo=0&movieNo=' + str(self.movie_id)
- self.imagelinks = self.open_page(self.parent_window, url=url)
-
def get_image(self):
- if string.find(self.imagelinks, '|') > 0:
- self.image_url = gutils.before(self.imagelinks, '|')
+ self.image_url = ''
+ url = url = gutils.trim(gutils.trim(self.page, 'class="film-image"', '>'), 'http://', ')')
+ if url:
+ self.image_url = 'http://' + url
def get_o_title(self):
- self.o_title = gutils.clean(gutils.after(
- gutils.regextrim(self.page, 'class="text_ergebniss_faz_3"', '[ \t]+[(]Originaltitel[)]'), '</a>'))
- p1 = string.rfind(self.o_title, ',')
- if p1 > 0:
- self.o_title = self.o_title[p1 + 1:]
- self.o_title = string.capwords(self.o_title)
- if self.o_title == '':
- self.o_title = gutils.after(gutils.trim(self.page, 'class="text_ergebniss_faz_3"', '</a>'), '>')
+ self.o_title = string.capwords(gutils.clean(gutils.regextrim(self.page, '<b>Originaltitel:', '(</p>|<b>)')))
+ if not self.o_title:
+ self.o_title = gutils.after(gutils.trim(self.page, 'class=\'film-titel\'', '</h1>'), '>')
def get_title(self):
- self.title = gutils.after(gutils.trim(self.page, 'class="text_ergebniss_faz_3"', '</a>'), '>')
+ self.title = gutils.after(gutils.trim(self.page, 'class=\'film-titel\'', '</h1>'), '>')
def get_director(self):
- self.director = gutils.after(gutils.trim(self.page, '(Regie)', '</span>'), '>')
- self.director = re.sub(',[ ]*$', '', self.director)
+ self.director = gutils.trim(self.page, '<b>Regie:', '</p>')
def get_plot(self):
- self.plot = gutils.after(gutils.trim(self.page, 'Inhalt des Films:', '</td>'), '</div>')
+ self.plot = gutils.after(gutils.trim(self.page, 'class=\'film-text\'', '</p>'), '>')
def get_year(self):
- self.year = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsjahr', '</a>'), '>')
+ self.year = gutils.after(gutils.trim(self.page, '<b>Produktionsjahr:', '<br/>'), '>')
def get_runtime(self):
- self.runtime = gutils.trim(self.page, 'Länge: ', ' Minuten')
+ self.runtime = gutils.trim(self.page, '<b>Länge:', '<br/>')
def get_genre(self):
- elements = string.split(self.page, 'sucheNach=genre')
- if (elements[0]<>''):
- elements[0] = ''
- self.delimiter = ''
+ self.genre = gutils.after(gutils.trim(self.page, 'class=\'film-angaben\'', '</p>'), '>')
+ if ':' in self.genre:
self.genre = ''
- for element in elements:
- if (element <> ''):
- self.genre += self.delimiter + gutils.trim(element, '>', '</a>')
- self.delimiter = ", "
def get_cast(self):
- self.cast = gutils.regextrim(self.page, '[(]Darsteller[)]', '(</td>|<br><span[^>]+>)')
+ self.cast = gutils.trim(self.page, '<b>Darsteller:', '</p>')
self.cast = gutils.clean(self.cast)
- self.cast = self.cast.replace(' als ', _(' as '))
- self.cast = re.sub('( \t|\t|\r|\n)', '', self.cast)
- self.cast = self.cast.replace(',', '\n')
+ self.cast = self.cast.replace(' (', _(' as '))
+ self.cast = self.cast.replace('), ', '\n')
+ self.cast = self.cast.replace(')', '')
def get_classification(self):
- self.classification = gutils.regextrim(self.page, 'FSK:[ ]+', '[,;]')
+ self.classification = gutils.regextrim(self.page, '<b>FSK:[ ]*', '(<br/>|[,;])')
def get_studio(self):
- self.studio = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsfirma', '</span>'), '>')
- self.studio = string.replace(self.studio, '/', ',')
+ self.studio = gutils.after(gutils.trim(self.page, '<b>Produktionsfirma:', '<br/>'), '>')
+ self.studio = string.replace(self.studio, '/', ', ')
self.studio = re.sub(',[ ]*$', '', self.studio)
def get_o_site(self):
@@ -110,64 +96,59 @@
self.trailer = ''
def get_country(self):
- self.country = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsland', '</span>'), '>')
+ self.country = gutils.after(gutils.trim(self.page, '<b>Produktionsland:', '<br/>'), '>')
self.country = re.sub(',[ ]*$', '', self.country)
- self.country = string.replace(self.country, '/', ',')
+ self.country = string.replace(self.country, '/', ', ')
def get_rating(self):
self.rating = 0
def get_screenplay(self):
- self.screenplay = gutils.trim(self.page, '(Drehbuch)', '</span>')
+ self.screenplay = gutils.trim(self.page, '<b>Drehbuch:', '</p>')
self.screenplay = re.sub(',[ ]*$', '', self.screenplay)
def get_cameraman(self):
- self.cameraman = gutils.trim(self.page, '(Kamera)', '</span>')
+ self.cameraman = gutils.trim(self.page, '<b>Kamera:', '</p>')
self.cameraman = re.sub(',[ ]*$', '', self.cameraman)
class SearchPlugin(movie.SearchMovie):
def __init__(self):
- self.original_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&wert="
- self.translated_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&wert="
+ self.original_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=filmtitel&wert="
+ self.translated_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=filmtitel&wert="
self.encode = 'utf-8'
def search(self,parent_window):
if not self.open_search(parent_window):
return None
# used for looking for subpages
- tmp_page = gutils.trim(self.page, '<span class="trefferliste">', '</span>')
+ tmp_page = gutils.trim(self.page, '<li>Treffer', '</div>')
elements = string.split(tmp_page, 'cp=')
# first results
- tmp_page = gutils.after(gutils.trim(self.page, 'Alle Treffer aus der Kategorie', '<span class="trefferliste">'), "Titel:")
+ tmp_page = gutils.trim(self.page, '<ul class=\'film-liste\'>', '</ul>')
# look for subpages
for element in elements:
- element = gutils.before(element, '"')
+ element = gutils.before(element, '\'')
try:
tmp_element = int(element)
except:
tmp_element = 1
if tmp_element != 1:
- self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&cp=' + str(tmp_element) + "&wert="
+ self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=filmtitel&cp=' + str(tmp_element) + "&wert="
if self.open_search(parent_window):
- tmp_page2 = gutils.trim(self.page, 'Alle Treffer aus der Kategorie', '<span class="trefferliste">')
+ tmp_page2 = gutils.trim(self.page, '<ul class=\'film-liste\'>', '</ul>')
tmp_page = tmp_page + tmp_page2
self.page = tmp_page
return self.page
def get_searches(self):
- elements = string.split(self.page, '<div class="text_ergebniss_faz_3"')
+ elements = string.split(self.page, '<h2 class=\'film-titel\'>')
i = 1
while i < len(elements):
element = elements[i]
i = i + 1
- self.ids.append(gutils.trim(element, 'filmlexikon/?wert=', '&'))
- self.titles.append(string.strip(gutils.clean(
- gutils.trim(element, '>', '</a>') + ' (' +
- string.capwords(gutils.trim(element, '</a>', '(Originaltitel)')) + ', ' +
- gutils.after(gutils.trim(element, 'sucheNach=produktionsland', '</a>'), '>') + ', ' +
- gutils.after(gutils.trim(element, 'sucheNach=produktionsjahr', '</a>'), '>') +
- ')')))
+ self.ids.append(gutils.trim(element, 'wert=', '\''))
+ self.titles.append(gutils.trim(element, '>', '</a>'))
#
# Plugin Test
@@ -178,9 +159,9 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky' : [ 15, 15 ],
+ 'Rocky' : [ 17, 17 ],
'Arahan' : [ 1, 1 ],
- 'Ein glückliches Jahr' : [ 0, 0 ]
+ 'Ein glückliches Jahr' : [ 1, 1 ]
}
class PluginTest:
@@ -197,13 +178,13 @@
'o_title' : 'Rocky Balboa',
'director' : 'Sylvester Stallone',
'plot' : True,
- 'cast' : 'A.J. Benza' + _(' as ') + 'L.C.\n\
-Milo Ventimiglia' + _(' as ') + 'Rocky jr.\n\
+ 'cast' : 'Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
+Burt Young' + _(' as ') + 'Paulie\n\
Antonio Tarver' + _(' as ') + 'Mason \'The Line\' Dixon\n\
Geraldine Hughes' + _(' as ') + 'Marie\n\
-Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
-Burt Young' + _(' as ') + 'Paulie\n\
-Tony Burton' + _(' as ') + 'Duke',
+Milo Ventimiglia' + _(' as ') + 'Rocky jr.\n\
+Tony Burton' + _(' as ') + 'Duke\n\
+A.J. Benza' + _(' as ') + 'L.C.',
'country' : 'USA',
'genre' : 'Boxerfilm',
'classification' : 'ab 12',
@@ -217,25 +198,25 @@
'image' : True,
'rating' : False,
'screenplay' : 'Sylvester Stallone',
- 'cameraman' : 'J. Clark Mathis',
+ 'cameraman' : 'Clark Mathis',
},
'26956' : {
'title' : 'Bürgschaft für ein Jahr',
'o_title' : 'Bürgschaft für ein Jahr',
'director' : 'Herrmann Zschoche',
'plot' : True,
- 'cast' : 'Heide Kipp' + _(' as ') + 'Frau Braun\n\
-Jan Spitzer' + _(' as ') + 'Werner Horn\n\
+ 'cast' : 'Katrin Saß' + _(' as ') + 'Nina\n\
Monika Lennartz' + _(' as ') + 'Irmgard Behrend\n\
-Katrin Saß' + _(' as ') + 'Nina\n\
-Ursula Werner' + _(' as ') + 'Frau Müller\n\
-Christian Steyer' + _(' as ') + 'Heiner Menk\n\
Jaecki Schwarz' + _(' as ') + 'Peter Müller\n\
-Barbara Dittus' + _(' as ') + 'Heimleiterin',
+Christian Steyer' + _(' as ') + 'Heiner Menk\n\
+Jan Spitzer' + _(' as ') + 'Werner Horn\n\
+Heide Kipp' + _(' as ') + 'Frau Braun\n\
+Barbara Dittus' + _(' as ') + 'Heimleiterin\n\
+Ursula Werner' + _(' as ') + 'Frau Müller',
'country' : 'DDR',
'genre' : 'Arbeiterfilm, Frauenfilm, Literaturverfilmung',
'classification' : 'ab 6',
- 'studio' : 'DEFA, Gruppe "Berlin"',
+ 'studio' : 'DEFA, Gruppe Berlin""',
'o_site' : False,
'site' : 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=titel&wert=26956',
'trailer' : False,
@@ -254,9 +235,9 @@
'plot' : True,
'cast' : 'Ryu Seung-beom' + _(' as ') + 'Sang-hwan\n\
Yoon So-yi' + _(' as ') + 'Wi-jin\n\
-Yun Ju-sang' + _(' as ') + 'Mu-woon\n\
Ahn Sung-kee' + _(' as ') + 'Ja-woon\n\
-Jung Doo-hong' + _(' as ') + 'Heukwoon',
+Jung Doo-hong' + _(' as ') + 'Heukwoon\n\
+Yun Ju-sang' + _(' as ') + 'Mu-woon',
'country' : 'Südkorea',
'genre' : False,
'classification' : 'ab 16',
@@ -269,7 +250,7 @@
'runtime' : 108,
'image' : False,
'rating' : False,
- 'screenplay' : 'Ryoo Seung-wan',
+ 'screenplay' : 'Eun Ji-hie, Ryoo Seung-wan, Yu Seon-dong',
'cameraman' : 'Lee Jun-gyu',
}
}
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmtipset.py trunk/lib/plugins/movie/PluginMovieFilmtipset.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmtipset.py 2011-05-18 20:11:58.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieFilmtipset.py 2013-07-27 18:37:05.673547595 +0300
@@ -70,7 +70,7 @@
def get_genre(self):
self.genre = string.strip(gutils.trim(self.page, 'Nyckelord:', '</tr>'))
if self.genre == '':
- self.genre = string.strip(gutils.trim(self.page, 'Genre:', '</tr>'))
+ self.genre = string.strip(gutils.trim(self.page, 'Genre:</h2>', '</tr>'))
def get_cast(self):
self.cast = gutils.regextrim(self.page, 'Skådespelare[^:]*[:]', '</tr>')
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmweb.py trunk/lib/plugins/movie/PluginMovieFilmweb.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieFilmweb.py 2011-12-18 21:11:57.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieFilmweb.py 2013-07-27 18:37:05.670214115 +0300
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
-__revision__ = '$Id: PluginMovieFilmweb.py 1602 2011-12-18 19:11:55Z piotrek $'
+__revision__ = '$Id: PluginMovieFilmweb.py 1615 2012-01-10 20:58:15Z piotrek $'
-# Copyright (c) 2005-2011 Piotr Ożarowski
+# Copyright (c) 2005-2012 Piotr Ożarowski
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,12 +27,12 @@
plugin_name = 'Filmweb'
plugin_description = 'Web pełen filmów'
plugin_url = 'filmweb.pl'
-plugin_url_other = 'm.filmweb.pl'
+plugin_url_other = 'filmweb.pl'
plugin_server = '193.200.227.13'
plugin_language = _('Polish')
plugin_author = 'Piotr Ożarowski, Bartosz Kurczewski, Mariusz Szczepanek'
plugin_author_email = '<mariusz2806@gmail.com>'
-plugin_version = '1.28'
+plugin_version = '1.29'
class Plugin(movie.Movie):
@@ -50,11 +50,14 @@
def get_o_title(self):
self.url = self.url.replace(plugin_server, plugin_url)
- self.o_title = gutils.trim(self.page, '<title>', ' ')
- if self.o_title.find('/') > -1:
- self.o_title = gutils.trim(self.o_title, '/', '(')
- if self.o_title.find('(') > -1:
- self.o_title = gutils.before(self.o_title, '(')
+ self.o_title = gutils.trim(self.page, '', ' ')
+ if self.o_title.find('(') > -1:
+ self.o_title = gutils.before(self.o_title, '(')
+ if self.o_title.find('/') > -1:
+ self.o_title = gutils.before(self.o_title, '/')
def get_title(self):
self.url = self.url.replace(plugin_server, plugin_url)
@@ -68,20 +71,12 @@
self.director = gutils.trim(self.page, "reżyseria:", '')
self.director = gutils.after(self.director, '')
self.director = self.director.replace("(więcej...)", '')
- self.director = self.director.replace(' ', '\t')
- self.director = self.director.replace("\t ", '')
- self.director = self.director.replace("\t", '')
- self.director = self.director.replace(',', ', ')
self.director = gutils.strip_tags(self.director)
def get_screenplay(self):
self.screenplay = gutils.trim(self.page, "scenariusz:", '')
self.screenplay = gutils.after(self.screenplay, '')
self.screenplay = self.screenplay.replace("(więcej...)", '')
- self.screenplay = self.screenplay.replace(' ', '\t')
- self.screenplay = self.screenplay.replace("\t ", '')
- self.screenplay = self.screenplay.replace("\t", '')
- self.screenplay = self.screenplay.replace(',', ', ')
self.screenplay = gutils.strip_tags(self.screenplay)
def get_plot(self):
@@ -114,26 +109,16 @@
def get_genre(self):
self.genre = gutils.trim(self.page, "gatunek:", '')
- self.genre = self.genre.replace("\t", '')
- self.genre = self.genre.replace("\n", '')
- self.genre = self.genre.replace(' ', '')
- self.genre = self.genre.replace(',', ', ')
def get_cast(self):
self.cast = gutils.trim(self.page, ' """)
+ PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
def __init__(self):
- self.original_url_search = 'http://www.imdb.de/find?more=tt&q='
- self.translated_url_search = 'http://www.imdb.de/find?more=tt&q='
+ self.original_url_search = 'http://www.imdb.de/find?s=tt&q='
+ self.translated_url_search = 'http://www.imdb.de/find?s=tt&q='
self.encode = 'utf8'
self.remove_accents = False
def search(self,parent_window):
if not self.open_search(parent_window):
return None
- tmp = gutils.trim(self.page, ' angezeigt)', ' Treffergenauigkeit')
- if tmp == '':
- if self.PATTERN_POWERSEARCH.search(self.page) is None:
- self.page = ''
- else:
- self.page = tmp
- # correction of all &#xxx entities
- self.page = self.page.decode('iso8859-1')
- self.page = gutils.convert_entities(self.page)
- #self.page = self.page.encode(self.encode)
return self.page
-
+
def get_searches(self):
- elements = string.split(self.page, '')
- if len(elements) < 2:
- elements = string.split(self.page, ' ')
-
+ elements = string.split(self.page, '')))
- self.ids.append(entry[0])
+ if len(match) > 1:
+ tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
+ self.ids.append(match[1][0])
self.titles.append(tmp)
+ if len(self.ids) < 2:
+ # try to find a direct result
+ match = self.PATTERN_DIRECT.findall(self.page)
+ if len(match) > 0:
+ self.ids.append(match[0])
+
#
# Plugin Test
@@ -293,8 +286,8 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky Balboa' : [ 25, 25 ],
- 'Ein glückliches Jahr' : [ 47, 47 ]
+ 'Rocky Balboa' : [ 10, 10 ],
+ 'Ein glückliches Jahr' : [ 3, 3 ]
}
class PluginTest:
@@ -377,6 +370,7 @@
D.T. Carney' + _(' as ') + 'High Roller (nicht im Abspann)\n\
Ricky Cavazos' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
Rennie Cowan' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
+Kevin Deon' + _(' as ') + 'Jeno (nicht im Abspann)\n\
Deon Derrico' + _(' as ') + 'High Roller at Limo (nicht im Abspann)\n\
Jacob \'Stitch\' Duran' + _(' as ') + 'Dixon\'s Trainer (nicht im Abspann)\n\
Simon P. Edwards' + _(' as ') + 'Crowd Member (nicht im Abspann)\n\
@@ -390,6 +384,7 @@
Dean Mauro' + _(' as ') + 'Sports Journalist (nicht im Abspann) (unbestätigt)\n\
Burgess Meredith' + _(' as ') + 'Mickey Goldmill (Archivmaterial) (nicht im Abspann)\n\
Dan Montero' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
+Babs Moran' + _(' as ') + 'Obnoxious Fan (nicht im Abspann)\n\
Keith Moyer' + _(' as ') + 'Bargast (nicht im Abspann)\n\
Mr. T' + _(' as ') + 'Clubber Lang (Archivmaterial) (nicht im Abspann)\n\
Carol Anne Mueller' + _(' as ') + 'Restaurant Patron (nicht im Abspann)\n\
@@ -400,8 +395,8 @@
Ryan Tygh' + _(' as ') + 'Ring Photographer (nicht im Abspann)\n\
Kimberly Villanova' + _(' as ') + 'Businesswoman (nicht im Abspann)',
'country' : 'USA',
- 'genre' : 'Action | Drama | Romanze | Sport',
- 'classification' : False,
+ 'genre' : 'Drama | Sport',
+ 'classification' : '12',
'studio' : 'Metro-Goldwyn-Mayer (MGM) (presents) (copyright owner), Columbia Pictures (presents) (copyright owner), Revolution Studios (presents) (copyright owner), Rogue Marble',
'o_site' : False,
'site' : 'http://www.imdb.de/title/tt0479143',
@@ -443,7 +438,7 @@
Jacques Villedieu\n\
Harry Walter übrige Besetzung in alphabetischer Reihenfolge:\n\
Anouk Aimée' + _(' as ') + 'Une femme (Archivmaterial) (nicht im Abspann)\n\
-Elie Chouraqui' + _(' as ') + ' (nicht im Abspann)\n\
+Élie Chouraqui' + _(' as ') + ' (nicht im Abspann)\n\
Rémy Julienne' + _(' as ') + 'Chauffeur de taxi (nicht im Abspann)\n\
Jean-Louis Trintignant' + _(' as ') + 'Un homme (Archivmaterial) (nicht im Abspann)',
'country' : 'Frankreich | Italien',
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-es.py trunk/lib/plugins/movie/PluginMovieIMDB-es.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-es.py 2011-08-31 09:40:41.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieIMDB-es.py 2013-07-27 18:37:05.673547595 +0300
@@ -32,7 +32,7 @@
plugin_language = _('Spanish')
plugin_author = 'Pedro D. Snchez'
plugin_author_email = ''
-plugin_version = '0.3'
+plugin_version = '0.4'
class Plugin(movie.Movie):
def __init__(self, id):
@@ -207,37 +207,34 @@
return data
class SearchPlugin(movie.SearchMovie):
- PATTERN = re.compile(r"""""", re.IGNORECASE)
+ PATTERN = re.compile(r"""]+[>](.*?)""")
+ PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
def __init__(self):
- self.original_url_search = 'http://www.imdb.es/find?more=tt;q='
- self.translated_url_search = 'http://www.imdb.es/find?more=tt;q='
- self.encode = 'iso-8859-15'
+ self.original_url_search = 'http://www.imdb.es/find?s=tt&q='
+ self.translated_url_search = 'http://www.imdb.es/find?s=tt&q='
+ self.encode = 'utf8'
def search(self,parent_window):
if not self.open_search(parent_window):
return None
- self.sub_search()
return self.page
- def sub_search(self):
- self.page = gutils.regextrim(self.page, ' resultado[s]*[)]', 'Sugerencias Para Mejorar Sus Resultados');
- self.page = self.page.decode('iso-8859-15')
- # correction of all &#xxx entities
- self.page = gutils.convert_entities(self.page)
-
def get_searches(self):
- elements = string.split(self.page, '')
- if len(elements) < 2:
- elements = string.split(self.page, ' ')
-
+ elements = string.split(self.page, '')))
- self.ids.append(entry[0])
+ if len(match) > 1:
+ tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
+ self.ids.append(match[1][0])
self.titles.append(tmp)
+ if len(self.ids) < 2:
+ # try to find a direct result
+ match = self.PATTERN_DIRECT.findall(self.page)
+ if len(match) > 0:
+ self.ids.append(match[0])
+
#
# Plugin Test
@@ -248,7 +245,7 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky Balboa' : [ 25, 25 ]
+ 'Rocky Balboa' : [ 10, 10 ]
}
class PluginTest:
@@ -331,6 +328,7 @@
D.T. Carney' + _(' as ') + 'High Roller (sin acreditar)\n\
Ricky Cavazos' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
Rennie Cowan' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+Kevin Deon' + _(' as ') + 'Jeno (sin acreditar)\n\
Deon Derrico' + _(' as ') + 'High Roller at Limo (sin acreditar)\n\
Jacob \'Stitch\' Duran' + _(' as ') + 'Dixon\'s Trainer (sin acreditar)\n\
Simon P. Edwards' + _(' as ') + 'Crowd Member (sin acreditar)\n\
@@ -344,6 +342,7 @@
Dean Mauro' + _(' as ') + 'Sports Journalist (sin acreditar) (sin confirmar)\n\
Burgess Meredith' + _(' as ') + 'Mickey Goldmill (tomas de archivo) (sin acreditar)\n\
Dan Montero' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+Babs Moran' + _(' as ') + 'Obnoxious Fan (sin acreditar)\n\
Keith Moyer' + _(' as ') + 'Administrador del Bar (sin acreditar)\n\
Mr. T' + _(' as ') + 'Clubber Lang (tomas de archivo) (sin acreditar)\n\
Carol Anne Mueller' + _(' as ') + 'Restaurant Patron (sin acreditar)\n\
@@ -354,8 +353,8 @@
Ryan Tygh' + _(' as ') + 'Ring Photographer (sin acreditar)\n\
Kimberly Villanova' + _(' as ') + 'Businesswoman (sin acreditar)',
'country' : 'Estados Unidos',
- 'genre' : u'Accin | Drama | Romance | Deporte',
- 'classification' : u'Estados Unidos:PG | Singapur:PG | Finlandia:K-11 | Reino Unido:12A | Canad:G (British Columbia) | Australia:M | Irlanda:PG | Hong Kong:IIA | Mxico:A | Noruega:11 | Suiza:12 (canton of Geneva) | Suiza:12 (canton of Vaud) | Brasil:12 | Argentina:Atp | Malasia:U | Filipinas:PG-13 (MTRCB) | Portugal:M/12 | Corea del Sur:12 | Suecia:11 | Nueva Zelanda:M',
+ 'genre' : u'Drama | Deporte',
+ 'classification' : u'Estados Unidos:PG | Singapur:PG | Finlandia:K-11 | Reino Unido:12A | Canad:G (British Columbia) | Australia:M | Irlanda:PG | Hong Kong:IIA | Mxico:A | Noruega:11 | Suiza:12 (canton of Vaud) | Suiza:12 (canton of Geneva) | Brasil:12 | Argentina:Atp | Malasia:U | Filipinas:PG-13 (MTRCB) | Portugal:M/12 | Corea del Sur:12 | Suecia:11 | Nueva Zelanda:M | Italia:T | Alemania:12 | Francia:U',
'studio' : 'Metro-Goldwyn-Mayer (MGM) (presents) (copyright owner), Columbia Pictures (presents) (copyright owner), Revolution Studios (presents) (copyright owner), Rogue Marble',
'o_site' : False,
'site' : 'http://www.imdb.es/title/tt0479143',
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-it.py trunk/lib/plugins/movie/PluginMovieIMDB-it.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-it.py 2011-06-21 19:17:35.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieIMDB-it.py 2013-07-27 18:37:05.670214115 +0300
@@ -31,14 +31,14 @@
plugin_language = _('Italian')
plugin_author = 'Enrico Carlesso, Filippo Valsorda'
plugin_author_email = 'enrico@ecarlesso.org, filosottile.wiki -at- gmail com'
-plugin_version = '0.2'
+plugin_version = '0.3'
class Plugin(movie.Movie):
def __init__(self, id):
self.encode = 'iso8859-1'
self.movie_id = id
self.url = "http://www.imdb.it/title/tt%s" % self.movie_id
- self.o_url = "http://www.imdb.com/title/tt%s" % self.movie_id
+ self.o_url = "http://www.imdb.com/title/tt%s" % self.movie_id
def initialize(self):
self.cast_page = self.open_page(url=self.url + '/fullcredits')
@@ -107,13 +107,13 @@
self.studio = gutils.trim(self.page, '', self.page)
- if len(elements) < 2:
- elements = string.split(self.page, '')
- if len(elements):
- for element in elements[1:]:
- match = self.PATTERN2.findall(element)
- if len(match):
- tmp = re.sub('^[0-9]+[.]', '', gutils.clean(gutils.after(match[0][1], '>')))
- self.ids.append(match[0][0])
- self.titles.append(tmp)
- else:
+ elements = string.split(self.page, ' 1:
+ tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
+ self.ids.append(match[1][0])
self.titles.append(tmp)
+ if len(self.ids) < 2:
+ # try to find a direct result
+ match = self.PATTERN_DIRECT.findall(self.page)
+ if len(match) > 0:
+ self.ids.append(match[0])
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-pt.py trunk/lib/plugins/movie/PluginMovieIMDB-pt.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-pt.py 2011-02-08 23:10:58.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieIMDB-pt.py 2013-07-27 18:37:05.673547595 +0300
@@ -39,14 +39,14 @@
def __init__(self, id):
self.encode ='iso-8859-1'
self.movie_id = id
- self.url = "http://www.imdb.pt/title/" + str(self.movie_id)
+ self.url = "http://www.imdb.pt/title/tt" + str(self.movie_id)
def initialize(self):
self.page = gutils.convert_entities(self.page)
- self.cast_page = self.open_page(url=self.url + '/fullcredits')
- self.cast_page = gutils.convert_entities(self.cast_page)
- self.plot_page = self.open_page(url=self.url + '/plotsummary')
- self.plot_page = gutils.convert_entities(self.plot_page)
+ self.cast_page = self.open_page(url=self.url + '/fullcredits')
+ self.cast_page = gutils.convert_entities(self.cast_page)
+ self.plot_page = self.open_page(url=self.url + '/plotsummary')
+ self.plot_page = gutils.convert_entities(self.plot_page)
def get_image(self):
self.image_url = gutils.trim(self.page, u'src="http://ia.media-imdb.com/images/', u'.jpg" />')
@@ -65,8 +65,8 @@
self.director = gutils.strip_tags(self.director)
def get_plot(self):
- self.plot = gutils.trim(self.plot_page, u' ')
+ self.director = gutils.trim(self.creditspage, 'Regie:', ' ')
def get_plot(self):
self.plot = gutils.trim(self.page, ' ')
+ if not self.screenplay:
+ elements = re.split('Kamera:', '( |)')
if not self.cameraman:
self.cameraman= gutils.trim(self.creditspage, 'Kamera ', ' ')
+ if not self.cameraman:
+ elements = re.split('"function-title">Kamera', self.page)
+ delimiter = ''
+ for element in elements[1:]:
+ self.cameraman = self.cameraman + delimiter + gutils.trim(element, 'itemprop="name">', '<')
+ delimiter = ', '
class SearchPlugin(movie.SearchMovie):
@@ -340,7 +365,7 @@
for element in elements2:
if element <> None:
title = gutils.clean(gutils.trim(element,'>','')) + string.replace(' (' +
- gutils.clean(gutils.trim(element, '
', '
') + self.o_title = gutils.after(self.o_title, '') + if self.o_title == '': + self.o_title = gutils.trim(self.page, '', '
')
- url = gutils.after(self.cast, '')
- url = gutils.trim(url, 'href="', '"')
self.cast = gutils.before(self.cast, '')
- self.cast = self.cast.replace(chr(13), '')
- self.cast = self.cast.replace(chr(10), '')
- self.cast = self.cast.replace(" ", '\t')
- self.cast = self.cast.replace("\t ", '')
- self.cast = self.cast.replace('\t', '')
- self.cast = self.cast.replace(" (", '(')
- self.cast = self.cast.replace('(', " (")
+ self.cast = self.cast.replace(' ', '')
self.cast = self.cast.replace('
', _(" as "))
self.cast = self.cast.replace('', "\n")
- self.cast = self.cast.replace(' ', '')
+ self.cast = gutils.strip_tags(self.cast)
+ self.cast = self.cast.replace(' ', '')
+ self.cast = self.cast.replace(' ', ' ')
def get_classification(self):
self.classification = ''
@@ -151,11 +136,7 @@
self.trailer = ''
def get_country(self):
- self.country = gutils.trim(self.page, 'kraj', '')
- self.country = self.country.replace(' ', '')
- self.country = self.country.replace("e:", '')
- self.country = self.country.replace(":", '')
- self.country = self.country.replace("\t", '')
+ self.country = gutils.trim(self.page, 'produkcja:', '')
def get_rating(self):
self.rating = gutils.trim(self.page, '
', '
')
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieHKMDB.py trunk/lib/plugins/movie/PluginMovieHKMDB.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieHKMDB.py 2011-12-19 00:35:27.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieHKMDB.py 2013-07-27 18:37:05.686881516 +0300
@@ -1,6 +1,6 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieHKMDB.py 1605 2011-12-18 22:35:25Z piotrek $'
+__revision__ = '$Id: PluginMovieHKMDB.py 1633 2012-12-28 23:11:42Z mikej06 $'
# Copyright (c) 2010 Michael Jahn
#
@@ -183,25 +183,26 @@
'director' : 'Ting Chung (1)',
'plot' : False,
'cast' : 'John Liu Chung-Liang' + _(' as ') + 'Ma Tien Lang\n\
-Phillip Ko Fei' + _(' as ') + 'Fang Kang and his brother\n\
Stephen Tung Wai\n\
+Tong Bo-Wan' + _(' as ') + 'Ma\'s wife\n\
Suen Yuet\n\
-Wong Chi-Sang' + _(' as ') + 'Henchman\n\
+Phillip Ko Fei' + _(' as ') + 'Fang Kang and his brother\n\
Ga Hoi\n\
-Tong Bo-Wan' + _(' as ') + 'Ma\'s wife\n\
+Wong Kwok-Fai (2)' + _(' as ') + 'Fei Hu\n\
Peng Kong' + _(' as ') + 'Fei Lung\n\
Wong Hoi (3)\n\
-Chen Chin-Hai' + _(' as ') + 'extra\n\
-Mau Ging-Shun' + _(' as ') + 'extra\n\
-Wong Kwok-Fai (2)\n\
-Peter Chang\n\
-Cheung Chung-Kwai\n\
-Lui Wan-Biu' + _(' as ') + 'extra\n\
-Hung Ji-Yue\n\
+Wong Chi-Sang' + _(' as ') + 'Henchman\n\
Ho Szu-Yuan\n\
+Hung Ji-Yue\n\
+San Bao\n\
+Cheung Chung-Kwai (1)\n\
+Peter Chang Chi-Long\n\
Mark Lung Goon-Mo\n\
-Chan Jan (1)' + _(' as ') + 'extra\n\
-Fan Fung-San' + _(' as ') + 'extra',
+Fan Fung-San' + _(' as ') + '[Extra]\n\
+Chan Jan (1)' + _(' as ') + '[Extra]\n\
+Chen Chin-Hai' + _(' as ') + '[Extra]\n\
+Mau Ging-Shun' + _(' as ') + '[Extra]\n\
+Lui Wan-Biu' + _(' as ') + '[Extra]',
'country' : 'Taiwan',
'genre' : 'Martial Arts',
'classification' : False,
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-de.py trunk/lib/plugins/movie/PluginMovieIMDB-de.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieIMDB-de.py 2011-08-31 09:40:41.000000000 +0300
+++ trunk/lib/plugins/movie/PluginMovieIMDB-de.py 2013-07-27 18:37:05.673547595 +0300
@@ -1,8 +1,8 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieIMDB-de.py 1577 2011-08-30 21:13:26Z mikej06 $'
+__revision__ = '$Id: PluginMovieIMDB-de.py 1638 2013-01-29 21:36:08Z mikej06 $'
-# Copyright (c) 2007-2011 Michael Jahn
+# Copyright (c) 2007-2012 Michael Jahn
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
plugin_language = _('German')
plugin_author = 'Michael Jahn'
plugin_author_email = 'mikej06@hotmail.com'
-plugin_version = '1.8'
+plugin_version = '1.9'
class Plugin(movie.Movie):
def __init__(self, id):
@@ -247,42 +247,35 @@
return data
class SearchPlugin(movie.SearchMovie):
- PATTERN = re.compile(r"""""", re.IGNORECASE)
- PATTERN_POWERSEARCH = re.compile(r"""Here are the [0-9]+ matching titles""")
+ PATTERN = re.compile(r"""]+[>](.*?)Compagnia:
', '') def get_o_site(self): - self.o_site = "http://italian.imdb.com/title/tt%s/officialsites" % self.movie_id + self.o_site = "http://www.imdb.it/title/tt%s/officialsites" % self.movie_id def get_site(self): - self.site = "http://italian.imdb.com/title/tt%s" % self.movie_id + self.site = "http://www.imdb.it/title/tt%s" % self.movie_id def get_trailer(self): - self.trailer = "http://italian.imdb.com/title/tt%s/trailers" % self.movie_id + self.trailer = "http://www.imdb.it/title/tt%s/trailers" % self.movie_id def get_country(self): self.country = gutils.trim(self.page, 'Nazionalità:
', '') @@ -181,50 +181,30 @@ return data class SearchPlugin(movie.SearchMovie): - PATTERN = re.compile(r"""(.*?)""") - PATTERN2 = re.compile(r"""""") + PATTERN = re.compile(r"""]+[>](.*?)""") + PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""") def __init__(self): - self.original_url_search = 'http://italian.imdb.com/find?s=tt;q=' - self.translated_url_search = 'http://italian.imdb.com/find?s=tt;q=' - self.encode = 'iso8859-1' + self.original_url_search = 'http://www.imdb.it/find?s=tt&q=' + self.translated_url_search = 'http://www.imdb.it/find?s=tt&q=' + self.encode = 'utf8' - def search(self, parent_window): + def search(self,parent_window): if not self.open_search(parent_window): return None - tmp_page = gutils.trim(self.page, 'Titoli popolari', '') - if not tmp_page: - has_results = re.match('[(]Visualizza [1-9][0-7]* risultat[io]*[)]', self.page) - if not has_results: - # nothing or one result found, try another url which looks deeper in the imdb database - # example: Adventures of Falcon -> one result, jumps directly to the movie page - # which isn't supported by this plugin - self.url = 'http://italian.imdb.com/find?more=tt;q=' - if not self.open_search(parent_window): - return None - self.page = gutils.trim(self.page, '(Visualizza', '>Suggerimenti per migliorare i tuoi risultati<') - else: - self.page = tmp_page - self.page = self.page.decode('iso-8859-1') - # correction of all &#xxx entities - self.page = gutils.convert_entities(self.page) return self.page def get_searches(self): - elements = re.split('', u'
')
- self.plot = gutils.strip_tags(self.plot)
+ self.plot = gutils.trim(self.plot_page, u'', u'
')
+ self.plot = gutils.strip_tags(self.plot)
self.plot = self.plot.encode(self.encode)
def get_year(self):
@@ -103,8 +103,8 @@
def get_studio(self):
self.studio = gutils.trim(self.page, u'Companhia :
', u'Exibir mais')
- self.studio = gutils.strip_tags(self.studio)
- self.studio = self.studio.encode(self.encode)
+ self.studio = gutils.strip_tags(self.studio)
+ self.studio = self.studio.encode(self.encode)
def get_o_site(self):
self.o_site = ""
@@ -125,11 +125,12 @@
def get_rating(self):
self.rating = gutils.trim(self.page, u'
', '
Drehbuch
', self.page) + delimiter = '' + for element in elements[1:]: + self.screenplay = self.screenplay + delimiter + gutils.trim(element, 'itemprop="name">', '<') + delimiter = ', ' def get_cameraman(self): self.cameraman = gutils.regextrim(self.page, '', "
")) + ')', '()', '')
+ gutils.clean(gutils.trim(gutils.before(element, ''), '
', "
")) + ')', '()', '')
if title != ' ':
id = re.sub('[?].*', '', gutils.before(element,'"'))
self.ids.append("V_" + id)
@@ -364,7 +389,7 @@
# dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
#
test_configuration = {
- 'Rocky Balboa' : [ 9, 9 ],
+ 'Rocky Balboa' : [ 10, 10 ],
'Arahan' : [ 10, 10 ],
'Ein glückliches Jahr' : [ 4, 4 ]
}
@@ -393,12 +418,12 @@
A.J. Benza' + _(' as ') + 'L.C.',
'country' : 'USA',
'genre' : 'Drama',
- 'classification' : 'ab 12 Jahre',
+ 'classification' : '12',
'studio' : 'Fox',
'o_site' : False,
'site' : 'http://www.kino.de/kinofilm/rocky-balboa/96132.html',
'trailer' : 'http://www.kino.de/kinofilm/rocky-balboa/trailer/96132.html',
- 'year' : 2006,
+ 'year' : 2007,
'notes' : False,
'runtime' : 102,
'image' : True,
@@ -417,14 +442,14 @@
André Falcon',
'country' : 'Frankreich/Italien',
'genre' : 'Drama',
- 'classification' : 'ab 12',
- 'studio' : 'Black Hill Pictures',
+ 'classification' : '12',
+ 'studio' : 'Columbia TriStar',
'o_site' : False,
'site' : 'http://www.kino.de/kinofilm/ein-glueckliches-jahr/28675.html',
'trailer' : 'http://www.kino.de/kinofilm/ein-glueckliches-jahr/trailer/28675.html',
'year' : 1973,
'notes' : False,
- 'runtime' : 110,
+ 'runtime' : 115,
'image' : True,
'rating' : False,
'cameraman' : 'Jean Collomb',
diff -ur -x .svn -x .git -x .bzr -x CVS -x AUTHORS -x ChangeLog ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieOFDb.py trunk/lib/plugins/movie/PluginMovieOFDb.py
--- ../BUILD.i686-linux/griffith-0.13/lib/plugins/movie/PluginMovieOFDb.py 2011-12-04 17:59:11.000000000 +0200
+++ trunk/lib/plugins/movie/PluginMovieOFDb.py 2013-07-27 18:37:05.666880634 +0300
@@ -1,6 +1,6 @@
# -*- coding: UTF-8 -*-
-__revision__ = '$Id: PluginMovieOFDb.py 1599 2011-12-02 19:52:02Z mikej06 $'
+__revision__ = '$Id: PluginMovieOFDb.py 1641 2013-01-30 12:24:47Z mikej06 $'
# Written by Christian Sagmueller (Länge|Länge|Runtime):
', ' (min|Min)')
+ self.runtime = gutils.after(gutils.regextrim(self.imdb_page, 'itemprop="duration"', ' (min|Min)'), '>')
def get_genre(self):
self.genre = gutils.trim(self.page,"Genre(s):","")
@@ -94,10 +94,10 @@
def get_studio(self):
# from imdb
- self.studio = gutils.regextrim(self.imdb_page, '(Firma|Company):
', '')
+ self.studio = gutils.regextrim(self.imdb_page, 'Production Co:', '(