fixup! Impement plex login with click module

Taxel · Apr 12, 2021 · 04743f1 · 04743f1
1 parent 53b12d7
commit 04743f1
Showing 1 changed file with 2 additions and 39 deletions.
diff --git a/plex_trakt_sync/commands/plex_login.py b/plex_trakt_sync/commands/plex_login.py
@@ -2,17 +2,15 @@
 from click import Choice
 from plexapi.exceptions import Unauthorized
 from plexapi.myplex import MyPlexAccount
-from plexapi.server import PlexServer
 from plex_trakt_sync.config import CONFIG
-from plex_trakt_sync.plex_api import PlexApi
 
 PROMPT_PLEX_PASSWORD = click.style("Please enter your Plex password", fg="yellow")
 PROMPT_PLEX_USERNAME = click.style("Please enter your Plex username", fg="yellow")
 PROMPT_PLEX_RELOGIN = click.style("You already logged in to Plex, do you want to log in again?", fg="yellow")
 PROMPT_MANAGED_USER = click.style("Do you want to use managed user instead of main account?", fg="yellow")
 
 
-def plex_login(username, password):
+def myplex_login(username, password):
     while True:
         username = click.prompt(PROMPT_PLEX_USERNAME, type=str, default=username)
         password = click.prompt(PROMPT_PLEX_PASSWORD, type=str, default=password, hide_input=True, show_default=False)
@@ -49,28 +47,8 @@ def choose_managed_user(account: MyPlexAccount):
 
     return None
 
-    # print(users)
-    # print(user)
-    # if int(choice) == len(users):
-    #     return
-
-    # def validate_rolls(ctx, param, value):
-    #     try:
-    #         user_account = account.user(value)
-    #     except ValueError:
-    #         raise click.BadParameter('rolls need to be in format NdM')
-    #
-    # name = click.prompt("Choose the user", type=Choice, callback=validate_rolls)
-
-    # return None
-
-def get_token():
-    pass
-
 
 @click.command()
-# @click.option("--username", help="Plex login", default=lambda: CONFIG["PLEX_USERNAME"], show_default='current user')
-# @click.option("--username", help="Plex login", default=lambda: CONFIG["PLEX_USERNAME"], show_default=CONFIG["PLEX_USERNAME"])
 @click.option("--username", help="Plex login", default=CONFIG["PLEX_USERNAME"])
 @click.option("--password", help="Plex password")
 def plex_login(username, password):
@@ -82,7 +60,7 @@ def plex_login(username, password):
         if not click.confirm(PROMPT_PLEX_RELOGIN, default=True):
             return
 
-    account = plex_login(username, password)
+    account = myplex_login(username, password)
     click.secho("Login success!", fg="green")
 
     managed_user = choose_managed_user(account)
@@ -93,21 +71,6 @@ def plex_login(username, password):
         user = username
         token = account.machineIdentifier
 
-
     baseurl = account._baseurl
 
     print(f"User={user}, token={token}, {baseurl}")
-    # CONFIG["PLEX_USERNAME"] = username
-    # CONFIG["PLEX_TOKEN"] = token
-    # CONFIG["PLEX_BASEURL"] = plex._baseurl
-    # CONFIG["PLEX_FALLBACKURL"] = "http://localhost:32400"
-
-    # resources = account.resources()
-    # print(account)
-    # print(account.authenticationToken)/
-    # for resource in resources:
-    # servers= [[resource.name, resource.device] for resource in resources]
-    # print(servers)
-
-    # plex = account.resource(servername).connect()  # returns a PlexServer instance
-    # token = plex._token