auth.py: minor refactor

youtube_upload/auth.py

@@ -17,7 +17,7 @@ except ImportError:
     WEBKIT_BACKEND = "gtk"
 except ImportError:
     WEBKIT_BACKEND = None
-
+    
 YOUTUBE_UPLOAD_SCOPE = "https://www.googleapis.com/auth/youtube.upload"
 
 CHECK_AUTH_JS = """
@@ -37,36 +37,25 @@ CHECK_AUTH_JS = """
 CHECK_AUTH_JS_GTK = CHECK_AUTH_JS + "window.status = JSON.stringify(result);"
 CHECK_AUTH_JS_QT = CHECK_AUTH_JS + "result;"
 
-def _get_code_from_browser(url, size=(640, 480), title="Google authentication"):
-    if WEBKIT_BACKEND == "qt":
-        lib.debug("Using webkit backend: QT")
-        with lib.default_sigint():
-            return _get_code_from_browser_qt(url, size=size, title=title)
-    elif WEBKIT_BACKEND == "gtk":
-        lib.debug("Using webkit backend: GTK")
-        return _get_code_from_browser_gtk(url, size=size, title=title)
-    else:
-        raise NotImplementedError("Install pywebkitgtk or qtwebkit")
-   
-def on_qt_page_load_finished(dialog, webview):
+def _on_qt_page_load_finished(dialog, webview):
     to_s = lambda x: (str(x.toUtf8()) if isinstance(x, QtCore.QString) else x)
     frame = webview.page().currentFrame()
     jscode = QtCore.QString(CHECK_AUTH_JS_QT)
     res = frame.evaluateJavaScript(jscode)
     authorization = dict((to_s(k), to_s(v)) for (k, v) in res.toPyObject().items())
-    if authorization:
+    if authorization.has_key("authorized"):
         dialog.authorization_code = authorization.get("code")
         dialog.close()
    
-def _get_code_from_browser_qt(url, size=(640, 480), title="Google authentication"):
-    app = QtGui.QApplication(sys.argv)
+def _get_code_from_browser_qt(url, size, title):
+    app = QtGui.QApplication([])
     dialog = QtGui.QDialog()
     dialog.setWindowTitle(title)
     dialog.resize(*size)
     webview = QtWebKit.QWebView()
     webpage = QtWebKit.QWebPage()
     webview.setPage(webpage)           
-    webpage.loadFinished.connect(lambda: on_qt_page_load_finished(dialog, webview))
+    webpage.loadFinished.connect(lambda: _on_qt_page_load_finished(dialog, webview))
     webview.setUrl(QtCore.QUrl.fromEncoded(url))
     layout = QtGui.QGridLayout()
     layout.addWidget(webview)
@@ -78,12 +67,12 @@ def _get_code_from_browser_qt(url, size=(640, 480), title="Google authentication
 
 def _on_webview_status_bar_changed(webview, status, dialog):
     if status:
-        result = json.loads(status)
-        if result.has_key("authorized"):
-            dialog.set_data("authorization", result)
+        authorization = json.loads(status)
+        if authorization.has_key("authorized"):
+            dialog.set_data("authorization_code", authorization["code"])
             dialog.response(0)
     
-def _get_code_from_browser_gtk(url, size=(640, 480), title="Google authentication"):
+def _get_code_from_browser_gtk(url, size, title):
     """Open a webkit window and return the code the user wrote."""
     dialog = gtk.Dialog(title=title)
     webview = webkit.WebView()
@@ -96,24 +85,16 @@ def _get_code_from_browser_gtk(url, size=(640, 480), title="Google authenticatio
     
     dialog.connect("delete-event", lambda event, data: dialog.response(1))
     webview.connect("load-finished", 
-        lambda view, frame: view.execute_script(CHECK_AUTH_JS))       
+        lambda view, frame: view.execute_script(CHECK_AUTH_JS_GTK))       
     webview.connect("status-bar-text-changed", _on_webview_status_bar_changed, dialog)
-    dialog.set_data("authorization", None)
+    dialog.set_data("authorization_code", None)
     
     status = dialog.run()
     dialog.destroy()
     while gtk.events_pending():
         gtk.main_iteration(False)
-    authorization = dialog.get_data("authorization")    
-    if status == 0 and authorization and authorization.get("authorized"):
-        return authorization["code"]
+    return dialog.get_data("authorization_code")
         
-def _get_code_from_prompt(authorize_url):
-    """Show authorization URL and return the code the user wrote."""
-    message = "Check this link in your browser: {0}".format(authorize_url)
-    lib.debug(message)
-    return raw_input("Enter verification code: ")
-
 def _get_credentials_interactively(flow, storage, get_code_callback):
     """Return the credentials asking the user."""
     flow.redirect_uri = oauth2client.client.OOB_CALLBACK_URN
@@ -133,12 +114,30 @@ def _get_credentials(flow, storage, get_code_callback):
     else:
         return _get_credentials_interactively(flow, storage, get_code_callback)
 
+def get_code_from_prompt(authorize_url):
+    """Show authorization URL and return the code the user wrote."""
+    message = "Check this link in your browser: {0}".format(authorize_url)
+    lib.debug(message)
+    return raw_input("Enter verification code: ")
+
+def get_code_from_browser(url, size=(640, 480), title="Google authentication"):
+    if WEBKIT_BACKEND == "qt":
+        lib.debug("Using webkit backend: QT")
+        with lib.default_sigint():
+            return _get_code_from_browser_qt(url, size=size, title=title)
+    elif WEBKIT_BACKEND == "gtk":
+        lib.debug("Using webkit backend: GTK")
+        with lib.default_sigint():
+            return _get_code_from_browser_gtk(url, size=size, title=title)
+    else:
+        raise NotImplementedError("GUI auth requires pywebkitgtk or qtwebkit")
+
 def get_resource(client_secrets_file, credentials_file, get_code_callback=None):
     """Authenticate and return a googleapiclient.discovery.Resource object."""
     get_flow = oauth2client.client.flow_from_clientsecrets
     flow = get_flow(client_secrets_file, scope=YOUTUBE_UPLOAD_SCOPE)
     storage = oauth2client.file.Storage(credentials_file)
-    get_code = get_code_callback or _get_code_from_prompt
+    get_code = get_code_callback or get_code_from_prompt
     credentials = _get_credentials(flow, storage, get_code)
     if credentials:
         http = credentials.authorize(httplib2.Http())

youtube_upload/main.py

@@ -41,6 +41,7 @@ EXIT_CODES = {
     InvalidCategory: 3,
     AuthenticationError: 4,
     oauth2client.client.FlowExchangeError: 4,
+    NotImplementedError: 5,
 }
 
 WATCH_VIDEO_URL = "https://www.youtube.com/watch?v={id}"
@@ -124,7 +125,7 @@ def run_main(parser, options, args, output=sys.stdout):
     credentials = options.credentials_file or default_credentials
     debug("Using client secrets: {0}".format(client_secrets))
     debug("Using credentials file: {0}".format(credentials))
-    get_code_callback = (youtube_upload.auth._get_code_from_browser 
+    get_code_callback = (youtube_upload.auth.get_code_from_browser 
         if options.auth_gui else None)
     youtube = youtube_upload.auth.get_resource(client_secrets, credentials,
         get_code_callback=get_code_callback)