The branch, frodo has been updated
via daf1341cc8666a018443ed75c53a70e8c97e1350 (commit)
from 8eee4572991dbf2309ee0e87e02fd48a51832ffd (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=daf1341cc8666a018443ed75c53a70e8c97e1350
commit daf1341cc8666a018443ed75c53a70e8c97e1350
Author: Martijn Kaijser <[email protected]>
Date: Sat Feb 1 20:01:55 2014 +0100
[service.xbmc.versioncheck] 0.1.18
diff --git a/service.xbmc.versioncheck/addon.xml
b/service.xbmc.versioncheck/addon.xml
index 82973b1..9887145 100644
--- a/service.xbmc.versioncheck/addon.xml
+++ b/service.xbmc.versioncheck/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.xbmc.versioncheck"
name="XBMC Version Check"
- version="0.1.17"
+ version="0.1.18"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.addon" version="12.0.0"/>
diff --git a/service.xbmc.versioncheck/changelog.txt
b/service.xbmc.versioncheck/changelog.txt
index ffcede9..4b7a0bb 100644
--- a/service.xbmc.versioncheck/changelog.txt
+++ b/service.xbmc.versioncheck/changelog.txt
@@ -1,3 +1,6 @@
+v0.1.18
+- Added Gotham alpha user notice
+
v0.1.17
- Update with 13.0 Gotham_alpha11
diff --git a/service.xbmc.versioncheck/lib/common.py
b/service.xbmc.versioncheck/lib/common.py
index b3b5750..3e30477 100644
--- a/service.xbmc.versioncheck/lib/common.py
+++ b/service.xbmc.versioncheck/lib/common.py
@@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+import os
import xbmc
import xbmcaddon
import xbmcgui
@@ -25,6 +26,7 @@ __addon__ = xbmcaddon.Addon()
__addonversion__ = __addon__.getAddonInfo('version')
__addonname__ = __addon__.getAddonInfo('name')
__addonpath__ = __addon__.getAddonInfo('path').decode('utf-8')
+__addonprofile__ = xbmc.translatePath( __addon__.getAddonInfo('profile')
).decode('utf-8')
__icon__ = __addon__.getAddonInfo('icon')
def localise(id):
@@ -59,7 +61,7 @@ def dialog_yesno(line1 = 0, line2 = 0):
localise(line1),
localise(line2))
-def upgrade_message(msg, upgrade):
+def upgrade_message(msg, oldversion, upgrade):
# Don't show while watching a video
while(xbmc.Player().isPlayingVideo() and not xbmc.abortRequested):
xbmc.sleep(1000)
@@ -75,12 +77,13 @@ def upgrade_message(msg, upgrade):
localise(32001),
localise(32002))
# sets check to false which is checked on startup
- if dialog_yesno(32009, 32010):
+ if oldversion == "stable" and dialog_yesno(32009, 32010):
__addon__.setSetting("versioncheck_enable", 'false')
# set first run to false to only show a popup next startup / every two
days
__addon__.setSetting("versioncheck_firstrun", 'false')
+
# Show notification after firstrun
- elif not xbmc.abortRequested:
+ elif __addon__.getSetting("versioncheck_enable") == 'true':
if upgrade:
return dialog_yesno(msg)
else:
@@ -89,4 +92,11 @@ def upgrade_message(msg, upgrade):
15000,
__icon__))
else:
- pass
\ No newline at end of file
+ pass
+ # tells users to upgrade to nightlies as there are no more monthlies
+ if oldversion == "monthly":
+ upgrademessage =
__addon__.getSetting("versioncheck_gotham_alpha_notice") != 'false'
+ if upgrademessage:
+ __addon__.setSetting("versioncheck_gotham_alpha_notice", 'false')
+ runcmd = os.path.join(__addonpath__, 'lib/viewer.py')
+ xbmc.executebuiltin('XBMC.RunScript (%s,%s) '%(runcmd,
'gotham-alpha_notice'))
diff --git a/service.xbmc.versioncheck/lib/versions.py
b/service.xbmc.versioncheck/lib/versions.py
index 0bd7607..f18b6ee 100644
--- a/service.xbmc.versioncheck/lib/versions.py
+++ b/service.xbmc.versioncheck/lib/versions.py
@@ -31,7 +31,7 @@ def compare_version(version_installed, versionlist):
msg = ''
if version_installed['major'] < int(versionlist_stable[0]['major']):
msg = 32003
- oldversion = True
+ oldversion = "stable"
log("Version available %s" %versionlist_stable[0])
# check on same major version installed and available
@@ -39,12 +39,12 @@ def compare_version(version_installed, versionlist):
# check on smaller minor version
if version_installed['minor'] < int(versionlist_stable[0]['minor']):
msg = 32003
- oldversion = True
+ oldversion = "stable"
log("Version available %s" %versionlist_stable[0])
# check if not installed a stable so always notify
elif version_installed['minor'] == int(versionlist_stable[0]['minor'])
and version_installed['tag'] != "stable":
msg = 32008
- oldversion = True
+ oldversion = "stable"
log("Version available %s" %versionlist_stable[0])
else:
log("Last available stable installed")
@@ -84,6 +84,15 @@ def compare_version(version_installed, versionlist):
oldversion = True
log("Version available %s" %versionlist_prealpha[0])
+ # exclude if installed RC, beta or alpha on checking for newer
prealpha
+ # if no more monthlies are build enable this section
+ if not oldversion and versionlist_prealpha and
version_installed['tag'] not in ["releasecandidate", "beta", "alpha"]:
+ if version_installed['major'] <=
int(versionlist_prealpha[0]['major']):
+ if version_installed['revision'] <=
versionlist_prealpha[0]['revision']:
+ msg = 32007
+ oldversion = "monthly"
+ log("Version available %s" %versionlist_prealpha[0])
+
log("Nothing to see here, move along. Running a latest non stable
release")
# Nothing to see here, move along
else:
diff --git a/service.xbmc.versioncheck/service.py
b/service.xbmc.versioncheck/service.py
index 8723a1b..a96c81a 100644
--- a/service.xbmc.versioncheck/service.py
+++ b/service.xbmc.versioncheck/service.py
@@ -17,7 +17,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-
import platform
import xbmc
import lib.common
@@ -29,12 +28,13 @@ __addonversion__ = lib.common.__addonversion__
__addonname__ = lib.common.__addonname__
__addonpath__ = lib.common.__addonpath__
__icon__ = lib.common.__icon__
+oldversion = False
class Main:
def __init__(self):
linux = False
packages = []
- if __addon__.getSetting("versioncheck_enable") == 'true' and not
xbmc.getCondVisibility('System.HasAddon(os.openelec.tv)'):
+ if not xbmc.getCondVisibility('System.HasAddon(os.openelec.tv)'):
if not sys.argv[0]:
xbmc.executebuiltin('XBMC.AlarmClock(CheckAtBoot,XBMC.RunScript(service.xbmc.versioncheck,
started),00:00:30,silent)')
xbmc.executebuiltin('XBMC.AlarmClock(CheckWhileRunning,XBMC.RunScript(service.xbmc.versioncheck,
started),24:00:00,silent,loop)')
@@ -45,7 +45,7 @@ class Main:
else:
oldversion, msg = _versioncheck()
if oldversion:
- _upgrademessage(msg, False)
+ _upgrademessage(msg, oldversion, False)
else:
pass
@@ -85,7 +85,7 @@ def _versionchecklinux(packages):
if handler:
if handler.check_upgrade_available(packages[0]):
- if _upgrademessage(32012, True):
+ if _upgrademessage(32012, oldversion, True):
if __addon__.getSetting("upgrade_system") == "false":
result = handler.upgrade_package(packages[0])
else:
-----------------------------------------------------------------------
Summary of changes:
service.xbmc.versioncheck/addon.xml | 2 +-
service.xbmc.versioncheck/changelog.txt | 3 +++
service.xbmc.versioncheck/lib/common.py | 18 ++++++++++++++----
service.xbmc.versioncheck/lib/versions.py | 15 ++++++++++++---
.../lib/viewer.py | 18 +++++++++++-------
.../resources/gotham-alpha_notice.txt | 7 +++++++
service.xbmc.versioncheck/service.py | 8 ++++----
7 files changed, 52 insertions(+), 19 deletions(-)
copy {script.artwork.downloader => service.xbmc.versioncheck}/lib/viewer.py
(79%)
create mode 100644 service.xbmc.versioncheck/resources/gotham-alpha_notice.txt
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
