From 4255f89c8a9d4e7ee631fbe1cb8ba2e66488535f Mon Sep 17 00:00:00 2001 From: Erik Kristensen Date: Sat, 12 Jun 2010 16:50:17 -0400 Subject: [PATCH] improving launch script, if user cancels out from entering server or if server cannot be verified then alert user and exit --- mythboxee/launch.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/mythboxee/launch.py b/mythboxee/launch.py index 9a68413..b3c279e 100644 --- a/mythboxee/launch.py +++ b/mythboxee/launch.py @@ -2,7 +2,7 @@ import mc config = mc.GetApp().GetLocalConfig() http = mc.Http() -#Debug Code +# For Debugging #config.SetValue("verified", "") #config.SetValue("server", "") @@ -13,30 +13,23 @@ def GetServer(): config = mc.GetApp().GetLocalConfig() server = config.GetValue("server") response = mc.ShowDialogKeyboard("Enter Full URL to MythBoxee Script", server, False) - if not response and not server: - GetServer() - elif response: + if VerifyServer(response) == True: config.SetValue("server", response) - -def VerifyServer(): - data = http.Get(config.GetValue("server") + "?type=verify") - if http.GetHttpResponseCode() != 200: - mc.ShowDialogOk("Error", "Unable to connect MythBoxee Script on MythBackend") - GetServer() - VerifyServer() - else: +def VerifyServer(url): + data = http.Get(url + "?type=verify") + if http.GetHttpResponseCode() == 200: config.SetValue("verified", "1") + return True + else: + return False -while not server and not verified: - if not server: - GetServer() - server = config.GetValue("server") - if not verified: - VerifyServer() - verified = config.GetValue("verified") +if not server: + GetServer() # If server is set, and at this point it has been verified # then launch the application -if verified: - mc.ActivateWindow(14000) \ No newline at end of file +if config.GetValue("verified") == "1": + mc.ActivateWindow(14000) +else: + mc.ShowDialogOk("MythBoxee Error", "You must enter the full path to the MythBoxee script or MythBoxee was unable to verify the URL provided.") \ No newline at end of file