The branch, frodo has been updated
via 7ff2d469530c06aae3fa08e98da9da96561f80ff (commit)
from 547d1711c7af80e8aaa5d28a386f024d83357515 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7ff2d469530c06aae3fa08e98da9da96561f80ff
commit 7ff2d469530c06aae3fa08e98da9da96561f80ff
Author: kibje <k...@xbmc.org>
Date: Mon Jul 1 12:13:18 2013 +0200
[plugin.video.previewnetworks] updated to version 2.3.3
diff --git a/plugin.video.previewnetworks/addon.xml
b/plugin.video.previewnetworks/addon.xml
index 68a4fa5..e04d7a2 100644
--- a/plugin.video.previewnetworks/addon.xml
+++ b/plugin.video.previewnetworks/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.previewnetworks"
name="Preview Networks"
- version="2.3.2"
+ version="2.3.3"
provider-name="nmazz64">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.previewnetworks/changelog.txt
b/plugin.video.previewnetworks/changelog.txt
index 4b189ad..cf08232 100644
--- a/plugin.video.previewnetworks/changelog.txt
+++ b/plugin.video.previewnetworks/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.3.3[/B]
+- same bug fix and other optimizations
+
[B]2.3.2[/B]
- optimizations to reduce the timing for download the list of video preview
@@ -8,7 +11,9 @@
- compatibility changes for Frodo beta
[B]2.2.1[/B]
-- Same bugfix[B]2.2[/B]
+- Same bugfix
+
+[B]2.2[/B]
- Solved the Download&View option
[B]2.1[/B]
diff --git a/plugin.video.previewnetworks/default.py
b/plugin.video.previewnetworks/default.py
index 0b879f7..5d85335 100644
--- a/plugin.video.previewnetworks/default.py
+++ b/plugin.video.previewnetworks/default.py
@@ -1,5 +1,5 @@
"""
- Plugin for streaming Preview network
+ Plugin for streaming Preview network
"""
# main imports
@@ -21,7 +21,7 @@ __author__ = "nmazz64"
__url__ = "http://code.google.com/p/previewnetworks-xbmc-plugin";
__svn_url__ =
"http://previewnetworks-xbmc-plugin.googlecode.com/svn/trunk/plugin.video.previewnetworks/";
__useragent__ = "QuickTime/7.6.5 (qtver=7.6.5;os=Windows NT 5.1Service Pack 3)"
-__version__ = "2.3.2"
+__version__ = "2.3.3"
__svn_revision__ = "$Revision: 0$"
__XBMC_Revision__ = "31633"
__Channel_ID__ = "391100379-1"
@@ -52,8 +52,9 @@ def categories(root):
next_icon = os.path.join(Addon.getAddonInfo('path'), 'resources','images',
'next.png')
genre_icon = os.path.join(Addon.getAddonInfo('path'),
'resources','images', 'genre.png')
search_icon = os.path.join(Addon.getAddonInfo('path'),
'resources','images', 'search.png')
-## baseurl="http://%s.feed.previewnetworks.com/v3.1/%s/";
- baseurl="http://%s.hdplus.previewnetworks.com/v3.1/%s/";
+ #baseurl="http://%s.feed.previewnetworks.com/v3.1/%s/";
+ #baseurl="http://%s.hdplus.previewnetworks.com/v3.1/%s/";
+ baseurl="http://%s.%s.previewnetworks.com/v3.1/%s/";
if root:
addDir(Addon.getLocalizedString(30301),baseurl+'now-%s/%s',1,now_icon)
@@ -62,35 +63,34 @@ def categories(root):
addDir(Addon.getLocalizedString(30300),'genre:',0,genre_icon)
addDir(Addon.getLocalizedString(30340),baseurl+'search-%s/%s/?search_field=product_title&search_query=%s',99,search_icon)
else:
-
addDir(Addon.getLocalizedString(30304),baseurl+'CinemaAction/%s',10,icona)
-
addDir(Addon.getLocalizedString(30305),baseurl+'CinemaAdventure/%s',11,icona)
-
addDir(Addon.getLocalizedString(30306),baseurl+'CinemaAnimation/%s',12,icona)
-
addDir(Addon.getLocalizedString(30307),baseurl+'CinemaBiography/%s',13,icona)
-
addDir(Addon.getLocalizedString(30308),baseurl+'CinemaComedy/%s',14,icona)
-
addDir(Addon.getLocalizedString(30309),baseurl+'CinemaCrime/%s',15,icona)
-
addDir(Addon.getLocalizedString(30310),baseurl+'CinemaDocumentary/%s',16,icona)
-
addDir(Addon.getLocalizedString(30311),baseurl+'CinemaDrama/%s',17,icona)
-
addDir(Addon.getLocalizedString(30312),baseurl+'CinemaFamily/%s',18,icona)
-
addDir(Addon.getLocalizedString(30313),baseurl+'CinemaFantasy/%s',19,icona)
-
addDir(Addon.getLocalizedString(30314),baseurl+'CinemaFilmNoir/%s',20,icona)
-
addDir(Addon.getLocalizedString(30315),baseurl+'CinemaGameShow/%s',21,icona)
-
addDir(Addon.getLocalizedString(30316),baseurl+'CinemaHistory/%s',22,icona)
-
addDir(Addon.getLocalizedString(30317),baseurl+'CinemaHorror/%s',23,icona)
-
addDir(Addon.getLocalizedString(30318),baseurl+'CinemaMusic/%s',24,icona)
-
addDir(Addon.getLocalizedString(30319),baseurl+'CinemaMusical/%s',25,icona)
-
addDir(Addon.getLocalizedString(30320),baseurl+'CinemaMystery/%s',26,icona)
-
addDir(Addon.getLocalizedString(30321),baseurl+'CinemaNews/%s',27,icona)
-
addDir(Addon.getLocalizedString(30322),baseurl+'CinemaRealityTV/%s',28,icona)
-
addDir(Addon.getLocalizedString(30323),baseurl+'CinemaRomance/%s',29,icona)
-
addDir(Addon.getLocalizedString(30324),baseurl+'CinemaSciFi/%s',30,icona)
-
addDir(Addon.getLocalizedString(30325),baseurl+'CinemaShort/%s',31,icona)
-
addDir(Addon.getLocalizedString(30326),baseurl+'CinemaSport/%s',32,icona)
-
addDir(Addon.getLocalizedString(30327),baseurl+'CinemaTalkShow/%s',33,icona)
-
addDir(Addon.getLocalizedString(30328),baseurl+'CinemaThriller/%s',34,icona)
- addDir(Addon.getLocalizedString(30329),baseurl+'CinemaWar/%s',35,icona)
-
addDir(Addon.getLocalizedString(30330),baseurl+'CinemaWestern/%s',36,icona)
-
addDir(Addon.getLocalizedString(30331),baseurl+'CinemaChildrenMovie/%s',37,icona)
-
+
addDir(Addon.getLocalizedString(30304),baseurl+'CinemaAction-%s/%s',10,icona)
+
addDir(Addon.getLocalizedString(30305),baseurl+'CinemaAdventure-%s/%s',11,icona)
+
addDir(Addon.getLocalizedString(30306),baseurl+'CinemaAnimation-%s/%s',12,icona)
+
addDir(Addon.getLocalizedString(30307),baseurl+'CinemaBiography-%s/%s',13,icona)
+
addDir(Addon.getLocalizedString(30308),baseurl+'CinemaComedy-%s/%s',14,icona)
+
addDir(Addon.getLocalizedString(30309),baseurl+'CinemaCrime-%s/%s',15,icona)
+
addDir(Addon.getLocalizedString(30310),baseurl+'CinemaDocumentary-%s/%s',16,icona)
+
addDir(Addon.getLocalizedString(30311),baseurl+'CinemaDrama-%s/%s',17,icona)
+
addDir(Addon.getLocalizedString(30312),baseurl+'CinemaFamily-%s/%s',18,icona)
+
addDir(Addon.getLocalizedString(30313),baseurl+'CinemaFantasy-%s/%s',19,icona)
+
addDir(Addon.getLocalizedString(30314),baseurl+'CinemaFilmNoir-%s/%s',20,icona)
+
addDir(Addon.getLocalizedString(30315),baseurl+'CinemaGameShow-%s/%s',21,icona)
+
addDir(Addon.getLocalizedString(30316),baseurl+'CinemaHistory-%s/%s',22,icona)
+
addDir(Addon.getLocalizedString(30317),baseurl+'CinemaHorror-%s/%s',23,icona)
+
addDir(Addon.getLocalizedString(30318),baseurl+'CinemaMusic-%s/%s',24,icona)
+
addDir(Addon.getLocalizedString(30319),baseurl+'CinemaMusical-%s/%s',25,icona)
+
addDir(Addon.getLocalizedString(30320),baseurl+'CinemaMystery-%s/%s',26,icona)
+
addDir(Addon.getLocalizedString(30321),baseurl+'CinemaNews-%s/%s',27,icona)
+
addDir(Addon.getLocalizedString(30322),baseurl+'CinemaRealityTV-%s/%s',28,icona)
+
addDir(Addon.getLocalizedString(30323),baseurl+'CinemaRomance-%s/%s',29,icona)
+
addDir(Addon.getLocalizedString(30324),baseurl+'CinemaSciFi-%s/%s',30,icona)
+
addDir(Addon.getLocalizedString(30325),baseurl+'CinemaShort-%s/%s',31,icona)
+
addDir(Addon.getLocalizedString(30326),baseurl+'CinemaSport-%s/%s',32,icona)
+
addDir(Addon.getLocalizedString(30327),baseurl+'CinemaTalkShow-%s/%s',33,icona)
+
addDir(Addon.getLocalizedString(30328),baseurl+'CinemaThriller-%s/%s',34,icona)
+
addDir(Addon.getLocalizedString(30329),baseurl+'CinemaWar-%s/%s',35,icona)
+
addDir(Addon.getLocalizedString(30330),baseurl+'CinemaWestern-%s/%s',36,icona)
+
addDir(Addon.getLocalizedString(30331),baseurl+'CinemaChildrenMovie-%s/%s',37,icona)
def addDir(name,url,item,iconimage,parametri={},info={}):
standardParams={'url':url,'item':item}
diff --git a/plugin.video.previewnetworks/resources/__init__.py
b/plugin.video.previewnetworks/resources/__init__.py
index b3b1673..b93054b 100644
--- a/plugin.video.previewnetworks/resources/__init__.py
+++ b/plugin.video.previewnetworks/resources/__init__.py
@@ -1 +1 @@
-# Dummy file to make this directory a package.
+# Dummy file to make this directory a package.
diff --git
a/plugin.video.previewnetworks/resources/language/English/strings.xml
b/plugin.video.previewnetworks/resources/language/English/strings.xml
index 6deecb0..9fd0848 100644
--- a/plugin.video.previewnetworks/resources/language/English/strings.xml
+++ b/plugin.video.previewnetworks/resources/language/English/strings.xml
@@ -33,11 +33,12 @@
<string id="30042">- Add '-trailer' to saved trailers</string>
<string id="30043">- play existing file</string>
<string id="30050">Channel user ID</string>
- <string id="30060">Product</string>
- <string id="30061">Cinema</string>
- <string id="30062">DVD</string>
- <string id="30063">Bluray</string>
- <string id="30064">DVD & BluRay</string>
+ <string id="30060">Product</string>
+ <string id="30061">Cinema</string>
+ <string id="30062">DVD</string>
+ <string id="30063">Bluray</string>
+ <string id="30064">DVD & BluRay</string>
+ <string id="30065">HD Plus</string>
<string id="30070">Country</string>
<string id="30071">United Kingdom</string>
<string id="30072">France</string>
@@ -50,7 +51,7 @@
<string id="30079">Denmark</string>
<string id="30080">Sweden</string>
<string id="30081">Finland</string>
-
+
<string id="30090">Fanart image</string>
<string id="30091">- Use movie title for saved filename</string>
<string id="30100">- Fanart color one (AARRGGBB)</string>
@@ -60,14 +61,15 @@
<string id="30150">Show Clip Extra</string>
<string id="30151">Show file quality and format on title</string>
<string id="30152">Show original title</string>
- <string id="30153">Limit number of video list to</string>
-
- <string id="30030">Play mode</string>
+ <string id="30153">Max number of video previews into list</string>
+ <string id="30154">Debug</string>
+
+ <string id="30030">Play mode</string>
<string id="30031">Stream</string>
<string id="30032">Download</string>
<string id="30033">Download & Save</string>
<string id="30040">- Save folder</string>
-
+
<!-- plugin buttons -->
<string id="30201">Search...</string>
<string id="30202">Settings</string>
@@ -97,18 +99,18 @@
<string id="30802">320x180</string>
<string id="30803">400x226</string>
<string id="30804">640x360</string>
- <string id="30805">848x448</string>
+ <string id="30805">848x448</string>
<string id="30806">1280x720</string>
<string id="30807">1920x1080</string>
<string id="30808">undefined</string>
-
-
+
+
<!-- context menu labels -->
<string id="30900">Theater Showtimes</string>
<string id="30910">Download & Play</string>
<string id="30920">Play Trailer</string>
<string id="30930">Movie Information</string>
-
+
<!-- genre menu labels -->
<string id="30300">Genre</string>
<string id="30301">Now</string>
@@ -142,8 +144,8 @@
<string id="30329">War</string>
<string id="30330">Western</string>
<string id="30331">Children</string>
-
+
<!-- search labels -->
<string id="30340">Search</string>
-
+
</strings>
diff --git
a/plugin.video.previewnetworks/resources/language/Italian/strings.xml
b/plugin.video.previewnetworks/resources/language/Italian/strings.xml
index 51973db..cb2f1c9 100644
--- a/plugin.video.previewnetworks/resources/language/Italian/strings.xml
+++ b/plugin.video.previewnetworks/resources/language/Italian/strings.xml
@@ -33,11 +33,12 @@
<string id="30042">- aggiungi -trailer</string>
<string id="30043">- play file esistente</string>
<string id="30050">Channel user ID</string>
- <string id="30060">Seleziona prodotto</string>
- <string id="30061">Cinema</string>
- <string id="30062">DVD</string>
- <string id="30063">Bluray</string>
- <string id="30064">DVD & BluRay</string>
+ <string id="30060">Seleziona prodotto</string>
+ <string id="30061">Cinema</string>
+ <string id="30062">DVD</string>
+ <string id="30063">Bluray</string>
+ <string id="30064">DVD & BluRay</string>
+ <string id="30065">HD Plus</string>
<string id="30070">Nazione</string>
<string id="30071">Inghilterra</string>
<string id="30072">Francia</string>
@@ -50,7 +51,7 @@
<string id="30079">Danimarca</string>
<string id="30080">Svezia</string>
<string id="30081">Finlandia</string>
-
+
<string id="30090">Immagine Fanart</string>
<string id="30091">- Usa il titolo per salvare il file</string>
<string id="30100">- Fanart colore 1 (AARRGGBB)</string>
@@ -60,9 +61,10 @@
<string id="30150">Visualizza anche Clip extra</string>
<string id="30151">Mostra qualità e formato del file sul titolo</string>
<string id="30152">Visualizza titolo originale</string>
- <string id="30153">Limita il numero di video da elencare a</string>
-
-
+ <string id="30153">Numero massimo di anteprime da elencare</string>
+ <string id="30154">Abilita dedug con registro su log</string>
+
+
<!-- plugin buttons -->
<string id="30201">Ricerca...</string>
<string id="30202">Impostazioni</string>
@@ -91,17 +93,17 @@
<string id="30802">320x180</string>
<string id="30803">400x226</string>
<string id="30804">640x360</string>
- <string id="30805">848x448</string>
+ <string id="30805">848x448</string>
<string id="30806">1280x720</string>
<string id="30807">1920x1080</string>
<string id="30808">Non definita</string>
-
+
<!-- context menu labels -->
<string id="30900">Theater Showtimes</string>
<string id="30910">Download & Play Trailer</string>
<string id="30920">Avvia il filmato</string>
<string id="30930">Informazioni sul filmato</string>
-
+
<!-- genre menu labels -->
<string id="30300">Genere</string>
<string id="30301">Adesso nei cinema</string>
@@ -136,8 +138,8 @@
<string id="30330">Western</string>
<string id="30331">Bambini</string>
- <!-- search labels -->
+ <!-- search labels -->
<string id="30340">Ricerca</string>
-
+
</strings>
diff --git a/plugin.video.previewnetworks/resources/lib/download.py
b/plugin.video.previewnetworks/resources/lib/download.py
index b296d26..3403936 100644
--- a/plugin.video.previewnetworks/resources/lib/download.py
+++ b/plugin.video.previewnetworks/resources/lib/download.py
@@ -56,6 +56,7 @@ class _Info:
class Main:
+ #Addon = xbmcaddon.Addon( id=os.path.basename( os.getcwd() ) )
Addon = xbmcaddon.Addon( id=__plugin__)
def __init__( self ):
diff --git a/plugin.video.previewnetworks/resources/lib/trailers.py
b/plugin.video.previewnetworks/resources/lib/trailers.py
index 39481e3..c4f5b12 100644
--- a/plugin.video.previewnetworks/resources/lib/trailers.py
+++ b/plugin.video.previewnetworks/resources/lib/trailers.py
@@ -228,55 +228,37 @@ class _Parser:
def _add_video( self, video, total ):
try:
- # get our media item
dirItem = DirectoryItem()
-
- # set total items
dirItem.totalItems = total
# set the default icon
icon =
os.path.join(self.Addon.getAddonInfo('path'),'resource','images','list.png')
overlay = ( xbmcgui.ICON_OVERLAY_NONE, xbmcgui.ICON_OVERLAY_HD, )[
video["quality"] == "HD 480p" or video["quality"] == "HD 720p" or
video["quality"] == "HD 1080p"]
- # only need to add label and thumbnail, setInfo() and
addSortMethod() takes care of label2
dirItem.listitem = xbmcgui.ListItem( video[ "title" ],
iconImage=icon, thumbnailImage=video[ "poster" ])
- # release date and year
try:
- # format the date
release_date = datetime.date( int( video[ "releasedate"
].split( "-" )[ 0 ] ), int( video[ "releasedate" ].split( "-" )[ 1 ] ), int(
video[ "releasedate" ].split( "-" )[ 2 ] ) ).strftime( self.date_format )
- # we need just year also
year = int( video[ "releasedate" ].split( "-" )[ 0 ] )
except:
release_date = ""
year = 0
- # set the key information
# dirItem.listitem.setInfo( "video", { "Title": video[ "title" ],
"Overlay": overlay, "Size": video[ "size" ], "Year": year, "Plot": video[
"plot" ], "PlotOutline": video[ "plot" ], "Genre": video[ "genre" ], "Studio":
video[ "studio" ], "Director": video[ "director" ], "Duration": video[
"runtime" ], "Cast": video[ "cast" ], "Date": video[ "postdate" ] } )
dirItem.listitem.setInfo( "video", { "Title": video[ "title" ],
"Overlay": overlay, "Size": video[ "size" ], "Year": year, "Plot": video[
"plot" ], "PlotOutline": video[ "plot" ], "Genre": video[ "genre" ], "Studio":
video[ "studio" ], "Director": video[ "director" ], "Duration": video[
"runtime" ][:2], "Cast": video[ "cast" ]} )
- # set release date property
dirItem.listitem.setProperty( "releasedate", release_date )
dirItem.listitem.setProperty( "fanart_image", video[ "fanart" ] )
- # get filepath and tmp_filepath
tmp_path, filepath = get_legal_filepath( video[ "title" ], video[
"trailer" ], 2, self.settings[ "download_path" ], self.settings[ "use_title" ],
self.settings[ "use_trailer" ] )
# add the movie information item
dirItem.addContextMenuItem( self.Addon.getLocalizedString(30930),
"XBMC.Action(Info)" )
- # set theater showtimes menu item
- #..dirItem.addContextMenuItem( 30900,
"XBMC.RunPlugin(%s?Fetch_Showtimes=True&title=%s)" % ( sys.argv[ 0 ],
urllib.quote_plus( repr( video[ "title" ] ) ), ) )
- # check if trailer already exists if user specified
if ( self.settings[ "play_existing" ] and os.path.isfile(
filepath.encode( "utf-8" ) ) ):
dirItem.url = filepath
- # just add play trailer if trailer exists and user preference
to always play existing
dirItem.addContextMenuItem(
self.Addon.getLocalizedString(30920), "XBMC.PlayMedia(%s)" % ( dirItem.url, ) )
elif ( self.settings[ "play_mode" ] == 0 ):
dirItem.url = video[ "trailer" ]
- # we want both play and download if user preference is to
stream
dirItem.addContextMenuItem(
self.Addon.getLocalizedString(30910),
"XBMC.RunPlugin(%s?Download_Trailer=True&trailer_url=%s)" % ( sys.argv[ 0 ],
urllib.quote_plus( repr( video[ "trailer" ] ) ), ) )
dirItem.addContextMenuItem(
self.Addon.getLocalizedString(30920), "XBMC.PlayMedia(%s)" % ( dirItem.url, ) )
else:
dirItem.url = "%s?Download_Trailer=True&trailer_url=%s" % (
sys.argv[ 0 ], urllib.quote_plus( repr( video[ "trailer" ] ) ) )
- # only add download if user prefernce is not stream
dirItem.addContextMenuItem( self.Addon.getLocalizedString(
30910), "XBMC.RunPlugin(%s?Download_Trailer=True&trailer_url=%s)" % ( sys.argv[
0 ], urllib.quote_plus( repr( video[ "trailer" ] ) ), ) )
- # add settings menu item
dirItem.addContextMenuItem( xbmc.getLocalizedString( 1045 ),
"XBMC.RunPlugin(%s?OpenSettings)" % ( sys.argv[ 0 ], ) )
- # add the item to the media list
return self.MediaWindow.add( dirItem )
except:
print "PN2 ERROR: %s::%s (%d) - %s" % ( self.__class__.__name__,
sys.exc_info()[ 2 ].tb_frame.f_code.co_name, sys.exc_info()[ 2 ].tb_lineno,
sys.exc_info()[ 1 ], )
@@ -293,6 +275,7 @@ class Main:
title_option = ""
type_filter = ""
quality_filter = ""
+ debug_on = False
def __init__( self , url_source, item):
# get users preference
@@ -340,6 +323,11 @@ class Main:
self.settings[ "showtype" ] = True
self.settings[ "country" ] = [ int( self.Addon.getSetting( "country" )
) ]
self.settings[ "region" ] = ( "uk", "fr", "de", "es", "it", "ch",
"ch-fr", "nl", "dk", "se", "fi", )[ int( self.Addon.getSetting( "country" ) ) ]
+ if ( self.Addon.getSetting( "hdplus" ) == "true" ):
+ self.settings[ "hdplus" ] = "hdplus"
+ else:
+ self.settings[ "hdplus" ] = "feed"
+ self.settings[ "debug" ] = ( self.Addon.getSetting( "debug" ) ==
"true")
def getKeyboard(self, default = '', heading = '', hidden = False):
kboard = xbmc.Keyboard(default, heading, hidden)
@@ -360,24 +348,24 @@ class Main:
def get_xml_source( self ):
try:
ok = True
+ debug_on = self.settings["debug"]
# set proper source
extension = self.settings[ "region" ]+self.settings[ "product"
]+self.ITEM_CURRENT_URL
base_path = self.BASE_CURRENT_SOURCE_PATH % extension
- #print "extension %s" % extension
- #print "base_path %s" % base_path
-
+ if debug_on:
+ print "DEBUG: base_current_url= %s" % self.BASE_CURRENT_URL
if self.ITEM_CURRENT_URL == '99':
curr_phrase = ''
search_phrase = self.getKeyboard(default = curr_phrase,
heading = self.Addon.getLocalizedString(30102))
if search_phrase == '':
return -1
curr_phrase = search_phrase
- base_url = self.BASE_CURRENT_URL % (self.settings[ "region"
],self.settings[ "product" ],self.settings[ "max_previews" ],self.settings[
"channel_id" ],search_phrase)
+ base_url = self.BASE_CURRENT_URL % (self.settings[ "region"
],self.settings[ "hdplus" ],self.settings[ "product" ],self.settings[
"max_previews" ],self.settings[ "channel_id" ],search_phrase)
else:
- base_url = self.BASE_CURRENT_URL % (self.settings[ "region"
],self.settings[ "product" ],self.settings[ "max_previews" ],self.settings[
"channel_id" ])
+ base_url = self.BASE_CURRENT_URL % (self.settings[ "region"
],self.settings[ "hdplus" ],self.settings[ "product" ],self.settings[
"max_previews" ],self.settings[ "channel_id" ])
# print di url for get lists of video previews
- print "DEBUG: base_url= %s" % base_url
- #
+ if debug_on:
+ print "DEBUG: base_url= %s" % base_url
# get the source files date if it exists
try: date = os.path.getmtime( base_path )
except: date = 0
@@ -385,24 +373,19 @@ class Main:
if self.ITEM_CURRENT_URL == '99':
refresh = True
else:
- #refresh = ( ( time.time() - ( 24 * 60 * 60 ) ) >= date )
refresh = ( ( time.time() - ( 24 * 60 * 60 ) ) >= date )
# only fetch source if it's been more than a day
- print "DEBUG: open"
- if ( refresh ):
+ if debug_on:
+ print "DEBUG: open %s" % time.asctime ()
+ if ( refresh or debug_on):
# open url
- # req = urllib2.Request( base_url )
- # usock = urllib2.urlopen( req, timeout=60 )
- # usock = urllib2.urlopen( base_url , timeout = 60)
- # usock = urllib.urlopen( base_url )
-
user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
headers = { 'User-Agent' : user_agent }
req = urllib2.Request(base_url, None, headers)
try:
usock = urllib2.urlopen( req , timeout = 60)
except urllib2.HTTPError, e:
- print "URLLIB2 HTTPError: code=%s msg=%s header=%s
fp.read=%s" % (e.code , e.msg , e.headers , e.fp.read())
+ print "URLLIB2 HTTPError: code=%s msg=%s header=%s
fp.read=%s" % (e.code , e.msg , e.headers , e.fp.read())
# save file versione
# urllib.urlretrieve(base_url,base_path)
# usock = open( base_path, "r" )
@@ -410,22 +393,23 @@ class Main:
# open path
usock = open( base_path, "r" )
# format xml source
- print "DEBUG: start"
- #xmlSource = usock.read()
+ if debug_on:
+ print "DEBUG: start %s" % time.asctime ()
xmlSource = ''
for line in usock.read().split( '\n' ):
xmlSource += line.lstrip().rstrip().replace( '\r', ''
).replace( '\t', '' ).replace( '\n', '' )
- print "DEBUG: end"
- #
- # print "DEBUG: xmlSource= %s" % xmlSource
+ if debug_on:
+ print "DEBUG: end %s" % time.asctime ()
+ print "DEBUG: xmlSource= %s" % xmlSource
# close socket
usock.close()
- #print "DEBUG: close"
+ if debug_on:
+ print "DEBUG: close %s" % time.asctime ()
# save the xmlSource for future parsing
if ( refresh ):
ok = self.save_xml_source( xmlSource )
except:
- # oops print error message
+ # print error message
print "PN3 ERROR: %s::%s (%d) - %s" % ( self.__class__.__name__,
sys.exc_info()[ 2 ].tb_frame.f_code.co_name, sys.exc_info()[ 2 ].tb_lineno,
sys.exc_info()[ 1 ], )
ok = False
if ( ok ):
@@ -436,8 +420,7 @@ class Main:
def save_xml_source( self, xmlSource ):
try:
# set proper source
- # base_path = self.BASE_CURRENT_SOURCE_PATH
- extension = self.settings[ "region" ]+self.settings[ "product"
]+self.ITEM_CURRENT_URL
+ extension = self.settings[ "region" ]+self.settings[ "hdplus"
]+self.settings[ "product" ]+self.ITEM_CURRENT_URL
base_path = self.BASE_CURRENT_SOURCE_PATH % extension
# if the path to the source file does not exist create it
if ( not os.path.isdir( self.BASE_DATA_PATH ) ):
@@ -451,7 +434,7 @@ class Main:
# return successful
return True
except:
- # oops print error message
+ # print error message
print "PN4 ERROR: %s::%s (%d) - %s" % ( self.__class__.__name__,
sys.exc_info()[ 2 ].tb_frame.f_code.co_name, sys.exc_info()[ 2 ].tb_lineno,
sys.exc_info()[ 1 ], )
return False
diff --git a/plugin.video.previewnetworks/resources/settings.xml
b/plugin.video.previewnetworks/resources/settings.xml
index dc7f9cb..c3eb968 100644
--- a/plugin.video.previewnetworks/resources/settings.xml
+++ b/plugin.video.previewnetworks/resources/settings.xml
@@ -18,6 +18,7 @@
<setting id="use_title" type="bool" label="30041" default="true" />
<!--setting id="use_trailer" type="bool" enable="eq(-3,2) + !eq(-2,) +
eq(-1,true)" label="30042" default="true" /> -->
<setting id="play_existing" type="bool" enable="eq(-3,1)" label="30043"
default="true" />
- <!--setting type="sep" /> -->
- <!--setting id="fanart_image" type="pictures" label="30090" default=""
enable="False"/> -->
+ <setting type="sep" />
+ <setting id="hdplus" type="bool" label="30065" default="false" />
+ <setting id="debug" type="bool" label="30154" default="false" />
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.previewnetworks/addon.xml | 2 +-
plugin.video.previewnetworks/changelog.txt | 7 ++-
plugin.video.previewnetworks/default.py | 66 +++++++++---------
plugin.video.previewnetworks/resources/__init__.py | 2 +-
.../resources/language/English/strings.xml | 34 +++++-----
.../resources/language/Italian/strings.xml | 30 +++++----
.../resources/lib/download.py | 1 +
.../resources/lib/trailers.py | 71 ++++++++------------
.../resources/settings.xml | 5 +-
9 files changed, 106 insertions(+), 112 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
