The branch, eden has been updated
via b6c90d7f79ef27023fc89c44c080cb60a91054e7 (commit)
from 83b42bae522b2e0caf3a0b1e9aaa19df4b12b9c8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=b6c90d7f79ef27023fc89c44c080cb60a91054e7
commit b6c90d7f79ef27023fc89c44c080cb60a91054e7
Author: amet <[email protected]>
Date: Sun Apr 8 21:52:50 2012 +0400
[script.tvguide] -v 1.3.2
Version 1.3.2 - 2012-xx-xx
- Added initial version of rapier skin support (thanks Lunatixz)
Version 1.3.1 - 2012-04-05
- Fixed [I]foreign key constraint failed[/I] with certain XMLTV files
- Fixed problem with overwriting local cache of XMLTV file
diff --git a/script.tvguide/addon.xml b/script.tvguide/addon.xml
index f143c38..100e59f 100644
--- a/script.tvguide/addon.xml
+++ b/script.tvguide/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.tvguide" name="TV Guide" version="1.3.0"
provider-name="twinther [[email protected]]">
+<addon id="script.tvguide" name="TV Guide" version="1.3.2"
provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.tvguide/changelog.txt b/script.tvguide/changelog.txt
index 53ef8c4..b36cc36 100644
--- a/script.tvguide/changelog.txt
+++ b/script.tvguide/changelog.txt
@@ -1,3 +1,10 @@
+[B]Version 1.3.2 - 2012-xx-xx[/B]
+- Added initial version of rapier skin support (thanks Lunatixz)
+
+[B]Version 1.3.1 - 2012-04-05[/B]
+- Fixed [I]foreign key constraint failed[/I] with certain XMLTV files
+- Fixed problem with overwriting local cache of XMLTV file
+
[B]Version 1.3.0 - 2012-04-02[/B]
- Scheduled notifications from version 1.2.2 are lost and will have to be
re-scheduled
- Completely rewrote focus handling
diff --git a/script.tvguide/gui.py b/script.tvguide/gui.py
index 143eb07..ebacc52 100644
--- a/script.tvguide/gui.py
+++ b/script.tvguide/gui.py
@@ -17,7 +17,6 @@
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
#
-import os
import datetime
import threading
@@ -61,10 +60,6 @@ CHANNELS_PER_PAGE = 9
HALF_HOUR = datetime.timedelta(minutes = 30)
ADDON = xbmcaddon.Addon(id = 'script.tvguide')
-TEXTURE_BUTTON_NOFOCUS =
os.path.join(xbmc.translatePath(ADDON.getAddonInfo('path')), 'resources',
'skins', 'Default', 'media', 'tvguide-program-grey.png')
-TEXTURE_BUTTON_FOCUS =
os.path.join(xbmc.translatePath(ADDON.getAddonInfo('path')), 'resources',
'skins', 'Default', 'media', 'tvguide-program-grey-focus.png')
-TEXTURE_BUTTON_NOFOCUS_NOTIFY =
os.path.join(xbmc.translatePath(ADDON.getAddonInfo('path')), 'resources',
'skins', 'Default', 'media', 'tvguide-program-red.png')
-TEXTURE_BUTTON_FOCUS_NOTIFY =
os.path.join(xbmc.translatePath(ADDON.getAddonInfo('path')), 'resources',
'skins', 'Default', 'media', 'tvguide-program-red-focus.png')
def debug(s):
if DEBUG: xbmc.log(str(s), xbmc.LOGDEBUG)
@@ -653,11 +648,11 @@ class TVGuide(xbmcgui.WindowXML):
if cellWidth > 1:
if program.notificationScheduled:
- noFocusTexture = TEXTURE_BUTTON_NOFOCUS_NOTIFY
- focusTexture = TEXTURE_BUTTON_FOCUS_NOTIFY
+ noFocusTexture = 'tvguide-program-red.png'
+ focusTexture = 'tvguide-program-red-focus.png'
else:
- noFocusTexture = TEXTURE_BUTTON_NOFOCUS
- focusTexture = TEXTURE_BUTTON_FOCUS
+ noFocusTexture = 'tvguide-program-grey.png'
+ focusTexture = 'tvguide-program-grey-focus.png'
if cellWidth < 25:
title = '' # Text will overflow outside the button if it
is too narrow
diff --git
a/script.tvguide/resources/skins/Default/720p/script-tvguide-main.xml
b/script.tvguide/resources/skins/Default/720p/script-tvguide-main.xml
index 8b68ea9..c129b1b 100644
--- a/script.tvguide/resources/skins/Default/720p/script-tvguide-main.xml
+++ b/script.tvguide/resources/skins/Default/720p/script-tvguide-main.xml
@@ -68,6 +68,7 @@
<font>font13</font>
<align>center</align>
<aligny>center</aligny>
+ <include>Red_Textcolor</include>
</control>
<control type="label" id="4001">
<description>1st half hour column</description>
@@ -361,15 +362,11 @@
<posy>0</posy>
<width>2</width>
<height>515</height>
- <texture>timebar.png</texture>
+ <texture>tvguide-timebar.png</texture>
</control>
<control type="label" id="4200">
<description>visibility marker for loading group</description>
- <posx>540</posx>
- <posy>250</posy>
- <width>300</width>
- <height>55</height>
</control>
<control type="group">
<posx>340</posx>
@@ -385,7 +382,7 @@
<posy>0</posy>
<width>55</width>
<height>55</height>
- <texture>loading.gif</texture>
+ <texture>tvguide-loading.gif</texture>
</control>
<control type="label">
<description>loading splash</description>
diff --git a/script.tvguide/source.py b/script.tvguide/source.py
index 1369461..c11841a 100644
--- a/script.tvguide/source.py
+++ b/script.tvguide/source.py
@@ -480,6 +480,16 @@ class Source(object):
# For notifications
c.execute("CREATE TABLE notifications(channel TEXT, program_title
TEXT, source TEXT, FOREIGN KEY(channel, source) REFERENCES channels(id, source)
ON DELETE CASCADE)")
+ if version < [1,3, 1]:
+ # Recreate tables with FOREIGN KEYS as DEFERRABLE INITIALLY
DEFERRED
+ c.execute('UPDATE version SET major=1, minor=3, patch=1')
+ c.execute('DROP TABLE channels')
+ c.execute('DROP TABLE programs')
+ c.execute('CREATE TABLE channels(id TEXT, title TEXT, logo TEXT,
stream_url TEXT, source TEXT, visible BOOLEAN, weight INTEGER, PRIMARY KEY (id,
source), FOREIGN KEY(source) REFERENCES sources(id) ON DELETE CASCADE
DEFERRABLE INITIALLY DEFERRED)')
+ c.execute('CREATE TABLE programs(channel TEXT, title TEXT,
start_date TIMESTAMP, end_date TIMESTAMP, description TEXT, image_large TEXT,
image_small TEXT, source TEXT, updates_id INTEGER, FOREIGN KEY(channel, source)
REFERENCES channels(id, source) ON DELETE CASCADE DEFERRABLE INITIALLY
DEFERRED, FOREIGN KEY(updates_id) REFERENCES updates(id) ON DELETE CASCADE
DEFERRABLE INITIALLY DEFERRED)')
+ c.execute('CREATE INDEX program_list_idx ON programs(source,
channel, start_date, end_date)')
+ c.execute('CREATE INDEX start_date_idx ON programs(start_date)')
+ c.execute('CREATE INDEX end_date_idx ON programs(end_date)')
# make sure we have a record in sources for this Source
c.execute("INSERT OR IGNORE INTO sources(id, channels_updated)
VALUES(?, ?)", [self.KEY, datetime.datetime.fromtimestamp(0)])
@@ -666,6 +676,8 @@ class XMLTVSource(Source):
# if xmlTvFile doesn't exists or the file size is different from
tempFile
# we copy the tempFile to xmlTvFile which in turn triggers a
reload in self._isChannelListCacheExpired(..)
if not os.path.exists(self.xmlTvFile) or
os.path.getsize(self.xmlTvFile) != os.path.getsize(tempFile):
+ if os.path.exists(self.xmlTvFile):
+ os.unlink(self.xmlTvFile)
os.rename(tempFile, self.xmlTvFile)
def getDataFromExternal(self, date, progress_callback = None):
@@ -716,7 +728,6 @@ class XMLTVSource(Source):
Only check filesystem once every 5 minutes
"""
delta = datetime.datetime.now() - self.xmlTvFileLastChecked
- print str(delta.seconds)
if delta.seconds < 300:
return False
-----------------------------------------------------------------------
Summary of changes:
script.tvguide/addon.xml | 2 +-
script.tvguide/buggalo.py | 117 -----
script.tvguide/changelog.txt | 7 +
script.tvguide/gui.py | 13 +-
.../skins/Default/720p/script-tvguide-main.xml | 9 +-
.../media/{loading.gif => tvguide-loading.gif} | Bin 1924 -> 1924 bytes
.../media/{timebar.png => tvguide-timebar.png} | Bin 180 -> 180 bytes
script.tvguide/resources/skins/Default/skin.xml | 7 -
.../720p/script-tvguide-channels.xml | 0
.../720p/script-tvguide-main.xml | 527 +++++++++++++-------
.../720p/script-tvguide-menu.xml | 0
.../skins/skin.rapier/media/background-default.png | Bin 0 -> 230382 bytes
.../media/tvguide-channel-hidden.png | Bin 976 -> 976 bytes
.../media/tvguide-channel-leftarrow.png | Bin 358 -> 358 bytes
.../media/tvguide-channel-updownarrow.png | Bin 381 -> 381 bytes
.../media/tvguide-channel-visible.png | Bin 1082 -> 1082 bytes
.../media/tvguide-glasspane.png | Bin 5413 -> 5413 bytes
.../media/tvguide-loading.gif} | Bin 1924 -> 1924 bytes
.../media/tvguide-logo-drdk.png | Bin 6766 -> 6766 bytes
.../media/tvguide-logo-ontv.png | Bin 7132 -> 7132 bytes
.../media/tvguide-logo-tvtiddk.png | Bin 1369 -> 1369 bytes
.../media/tvguide-logo-xmltv.png | Bin 5758 -> 5758 bytes
.../media/tvguide-logo-youseetv.png | Bin 21209 -> 21209 bytes
.../media/tvguide-program-grey-focus.png | Bin 0 -> 338 bytes
.../skin.rapier/media/tvguide-program-grey.png | Bin 0 -> 368 bytes
.../media/tvguide-program-red-focus.png | Bin 3503 -> 3503 bytes
.../media/tvguide-program-red.png | Bin 3105 -> 3105 bytes
.../skins/skin.rapier/media/tvguide-timebar.png | Bin 0 -> 897 bytes
.../media/tvguide-white-progress.png | Bin 178 -> 178 bytes
script.tvguide/source.py | 13 +-
30 files changed, 361 insertions(+), 334 deletions(-)
delete mode 100644 script.tvguide/buggalo.py
copy script.tvguide/resources/skins/Default/media/{loading.gif =>
tvguide-loading.gif} (100%)
rename script.tvguide/resources/skins/Default/media/{timebar.png =>
tvguide-timebar.png} (100%)
delete mode 100644 script.tvguide/resources/skins/Default/skin.xml
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/720p/script-tvguide-channels.xml (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/720p/script-tvguide-main.xml (66%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/720p/script-tvguide-menu.xml (100%)
create mode 100644
script.tvguide/resources/skins/skin.rapier/media/background-default.png
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-channel-hidden.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-channel-leftarrow.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-channel-updownarrow.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-channel-visible.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-glasspane.png (100%)
rename script.tvguide/resources/skins/{Default/media/loading.gif =>
skin.rapier/media/tvguide-loading.gif} (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-logo-drdk.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-logo-ontv.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-logo-tvtiddk.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-logo-xmltv.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-logo-youseetv.png (100%)
create mode 100644
script.tvguide/resources/skins/skin.rapier/media/tvguide-program-grey-focus.png
create mode 100644
script.tvguide/resources/skins/skin.rapier/media/tvguide-program-grey.png
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-program-red-focus.png (100%)
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-program-red.png (100%)
create mode 100644
script.tvguide/resources/skins/skin.rapier/media/tvguide-timebar.png
copy script.tvguide/resources/skins/{Default =>
skin.rapier}/media/tvguide-white-progress.png (100%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
