diff --git a/python/list_streams.py b/python/list_streams.py index 095febae..14090fa9 100644 --- a/python/list_streams.py +++ b/python/list_streams.py @@ -1,14 +1,13 @@ #!/usr/bin/python -import httplib2 import os -import sys +import re -from apiclient.discovery import build -from apiclient.errors import HttpError -from oauth2client.client import flow_from_clientsecrets -from oauth2client.file import Storage -from oauth2client.tools import argparser, run_flow +import google.oauth2.credentials +import google_auth_oauthlib.flow +from googleapiclient.discovery import build +from googleapiclient.errors import HttpError +from google_auth_oauthlib.flow import InstalledAppFlow # The CLIENT_SECRETS_FILE variable specifies the name of a file that contains @@ -21,71 +20,43 @@ # https://developers.google.com/youtube/v3/guides/authentication # For more information about the client_secrets.json file format, see: # https://developers.google.com/api-client-library/python/guide/aaa_client_secrets -CLIENT_SECRETS_FILE = "client_secrets.json" +CLIENT_SECRETS_FILE = 'client_secret.json' # This OAuth 2.0 access scope allows for read-only access to the authenticated # user's account, but not other types of account access. -YOUTUBE_READONLY_SCOPE = "https://www.googleapis.com/auth/youtube.readonly" -YOUTUBE_API_SERVICE_NAME = "youtube" -YOUTUBE_API_VERSION = "v3" - -# This variable defines a message to display if the CLIENT_SECRETS_FILE is -# missing. -MISSING_CLIENT_SECRETS_MESSAGE = """ -WARNING: Please configure OAuth 2.0 - -To make this sample run you will need to populate the client_secrets.json file -found at: - - %s - -with information from the {{ Cloud Console }} -{{ https://cloud.google.com/console }} - -For more information about the client_secrets.json file format, please visit: -https://developers.google.com/api-client-library/python/guide/aaa_client_secrets -""" % os.path.abspath(os.path.join(os.path.dirname(__file__), - CLIENT_SECRETS_FILE)) - -def get_authenticated_service(args): - flow = flow_from_clientsecrets(CLIENT_SECRETS_FILE, - scope=YOUTUBE_READONLY_SCOPE, - message=MISSING_CLIENT_SECRETS_MESSAGE) - - storage = Storage("%s-oauth2.json" % sys.argv[0]) - credentials = storage.get() - - if credentials is None or credentials.invalid: - credentials = run_flow(flow, storage, args) - - return build(YOUTUBE_API_SERVICE_NAME, YOUTUBE_API_VERSION, - http=credentials.authorize(httplib2.Http())) - +SCOPES = ['https://www.googleapis.com/auth/youtube.readonly'] +API_SERVICE_NAME = 'youtube' +API_VERSION = 'v3' + +# Authorize the request and store authorization credentials. +def get_authenticated_service(): + flow = InstalledAppFlow.from_client_secrets_file(CLIENT_SECRETS_FILE, SCOPES) + credentials = flow.run_console() + return build(API_SERVICE_NAME, API_VERSION, credentials = credentials) + # Retrieve a list of the liveStream resources associated with the currently # authenticated user's channel. def list_streams(youtube): - print "Live streams:" + print 'Live streams:' list_streams_request = youtube.liveStreams().list( - part="id,snippet", + part='id,snippet', mine=True, maxResults=50 - ) - + ) + while list_streams_request: list_streams_response = list_streams_request.execute() - - for stream in list_streams_response.get("items", []): - print "%s (%s)" % (stream["snippet"]["title"], stream["id"]) - + + for stream in list_streams_response.get('items', []): + print '%s (%s)' % (stream['snippet']['title'], stream['id']) + list_streams_request = youtube.liveStreams().list_next( list_streams_request, list_streams_response) - -if __name__ == "__main__": - args = argparser.parse_args() - - youtube = get_authenticated_service(args) + +if __name__ == '__main__': + youtube = get_authenticated_service() try: list_streams(youtube) except HttpError, e: - print "An HTTP error %d occurred:\n%s" % (e.resp.status, e.content) + print 'An HTTP error %d occurred:\n%s' % (e.resp.status, e.content)