From 8e6dad3931a0b0716f2de6dc44990d06b537fd09 Mon Sep 17 00:00:00 2001 From: gugahoi Date: Fri, 1 Jul 2011 15:05:15 +1000 Subject: [PATCH 1/3] Added restart funtion and image to navbar. --- data/images/restart.png | Bin 0 -> 3394 bytes data/images/shutdown.png | Bin 0 -> 6443 bytes templates.py | 5 ++++- webServer.py | 11 +++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 data/images/restart.png create mode 100644 data/images/shutdown.png diff --git a/data/images/restart.png b/data/images/restart.png new file mode 100644 index 0000000000000000000000000000000000000000..9c95940f578475dc13a5e78e223ff76f25e42a24 GIT binary patch literal 3394 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 a;{r-pYl_t41DIfW0vv2y(WTY_2mb+?yG7*y literal 0 HcmV?d00001 diff --git a/templates.py b/templates.py index 17815da9..67c3e66d 100644 --- a/templates.py +++ b/templates.py @@ -23,7 +23,10 @@ _nav = '''''' _footer = ''' diff --git a/webServer.py b/webServer.py index c75ff37d..bf5aba3d 100644 --- a/webServer.py +++ b/webServer.py @@ -434,3 +434,14 @@ class Headphones: sys.exit(0) shutdown.exposed = True + + def restart(self): + restart = True + #answer = raw_input("Do you want to restart this program ? ") + #if answer.strip() in "y Y yes Yes YES".split(): + #restart = True + if restart: + python = sys.executable + os.execl(python, python, * sys.argv) + + restart.exposed = True \ No newline at end of file From 8fc9169247b1d424140f618f635bffa441c3bdf3 Mon Sep 17 00:00:00 2001 From: gugahoi Date: Fri, 1 Jul 2011 15:32:05 +1000 Subject: [PATCH 2/3] Ignoring .pyc and .log files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..939db295 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.log \ No newline at end of file From c39e105f23ba6cdc93e6d995becbd3f7bc5d3798 Mon Sep 17 00:00:00 2001 From: gugahoi Date: Fri, 1 Jul 2011 15:32:26 +1000 Subject: [PATCH 3/3] Added loging on restart function. --- webServer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/webServer.py b/webServer.py index bf5aba3d..9b581918 100644 --- a/webServer.py +++ b/webServer.py @@ -436,6 +436,7 @@ class Headphones: shutdown.exposed = True def restart(self): + logger.log(u"Restarting Headphones.") restart = True #answer = raw_input("Do you want to restart this program ? ") #if answer.strip() in "y Y yes Yes YES".split():