gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-22 19:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the updater issue hopefully - threaded shutdown/restart/update process

Browse Source
This commit is contained in:
Remy
2011-07-14 22:15:36 -07:00
parent f87da4c1a5
commit 8387ed8383
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Headphones.py
-1
View File
@@ -98,7 +98,6 @@ def main():
# Start the background threads
headphones.start()
return
headphones/__init__.py
+5 -8
View File
@@ -1,3 +1,5 @@
from __future__ import with_statement
import os, sys, subprocess
import threading
@@ -361,7 +363,6 @@ def start():
# Check for new versions
versioncheck.checkGithub()
started = True
def dbcheck():
@@ -395,13 +396,9 @@ def shutdown(restart=False, update=False):
popen_list = [sys.executable, FULL_PATH]
popen_list += ARGS
#if '--nolaunch' not in popen_list:
# popen_list += ['--nolaunch']
if '--nolaunch' not in popen_list:
popen_list += ['--nolaunch']
logger.info('Restarting Headphones with ' + str(popen_list))
subprocess.Popen(popen_list, cwd=os.getcwd())
os._exit(0)
def refresh():
raise cherrypy.HTTPRedirect("home")
os._exit(0)
headphones/webserve.py
+11 -8
View File
@@ -10,7 +10,7 @@ import string
import time
import datetime
import sqlite3
from threading import Thread
import threading
import headphones
from headphones.mb import getReleaseGroup
@@ -26,7 +26,7 @@ class WebInterface(object):
def home(self):
page = [templates._header]
if not headphones.LATEST_VERSION:
if not headphones.CURRENT_VERSION:
page.append('''<div class="updatebar">You're running an unknown version of Heapdhones. <a class="blue" href="update">Click here to update</a></div>''')
elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.INSTALL_TYPE != 'win':
page.append('''<div class="updatebar">A <a class="blue" href="http://github.com/rembo10/headphones/compare/%s...%s">
@@ -627,21 +627,24 @@ class WebInterface(object):
def shutdown(self):
logger.info(u"Headphones is shutting down...")
headphones.shutdown()
return 'Shutting down Headphones...'
threading.Timer(2, headphones.shutdown).start()
return '''<head></head>
Shutting Down Headphones....'''
shutdown.exposed = True
def restart(self):
logger.info(u"Headphones is restarting...")
headphones.shutdown(restart=True)
return 'Restarting Headphones...'
threading.Timer(2, headphones.shutdown, [True]).start()
return '''<head><meta http-equiv="refresh" content="20;url=home"></head>
Restarting Headphones....'''
restart.exposed = True
def update(self):
logger.info('Headphones is updating...')
headphones.shutdown(restart=True, update=True)
return 'Updating Headphones...'
threading.Timer(2, headphones.shutdown, [True, True]).start()
return '''<head><meta http-equiv="refresh" content="60;url=home"></head>
Updating Headphones....'''
update.exposed = True