From 8dce55c5ac57610ea78dfcf0c75cefa98425199f Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Thu, 16 May 2024 10:44:47 -0400 Subject: [PATCH] Speed things up by directly calling op --- requirements.txt | 1 - scripts/spotify-current-track-id | 36 +++++++++++++++++--------------- scripts/spotify-now-playing | 22 +++++++++---------- scripts/trello-dump-card | 21 +++++++++---------- 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/requirements.txt b/requirements.txt index 78b9f5f..24d5517 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ requests spotipy -pyonepassword git+https://github.com/1Password/onepassword-sdk-python.git@2a3c1eb82a6e0d7fbfa32f29dc0fe344f18a054a diff --git a/scripts/spotify-current-track-id b/scripts/spotify-current-track-id index 5591bcb..f1b7733 100755 --- a/scripts/spotify-current-track-id +++ b/scripts/spotify-current-track-id @@ -2,9 +2,9 @@ import argparse import sys +import subprocess import logging import spotipy -import pyonepassword from pathlib import Path from spotipy.oauth2 import SpotifyOAuth @@ -17,7 +17,11 @@ def main() -> int: prog="spotify-current-track-id", description="Get the currently playing track ID from Spotify", ) - ap.add_argument("--url", help="Print the URL of the currently playing track", action="store_true") + ap.add_argument( + "--url", + help="Print the URL of the currently playing track", + action="store_true", + ) ap.add_argument( "-v", "--verbose", help="Enable verbose logging", action="store_true" ) @@ -29,43 +33,41 @@ def main() -> int: format="%(levelname)s: %(message)s", ) - # Connect to 1Password - try: - op = pyonepassword.OP() - except Exception as e: - print(f"Failed to connect to 1Password: {e}", file=sys.stderr) - return 1 - - # Read API credentials - spotify_creds = op.item_get("rio7e6skp6bhkkcdo5w3kmabgq", vault="ewconfig") + # Read API credentials from 1Password + client_id = subprocess.check_output( + "op read -n 'op://ewconfig/rio7e6skp6bhkkcdo5w3kmabgq/Client ID'", shell=True + ).decode("utf-8") + client_secret = subprocess.check_output( + "op read -n 'op://ewconfig/rio7e6skp6bhkkcdo5w3kmabgq/credential'", shell=True + ).decode("utf-8") # Connect to Spotify cache_path = Path("~/.cache/spotipy/spotify-current-track-id.oauth").expanduser() cache_path.parent.mkdir(parents=True, exist_ok=True) oauth = SpotifyOAuth( - client_id=spotify_creds.first_field_by_label("Client ID").value, - client_secret=spotify_creds.first_field_by_label("credential").value, + client_id=client_id, + client_secret=client_secret, redirect_uri="http://localhost:8933", scope="user-read-currently-playing", cache_path=cache_path.as_posix(), - open_browser=True + open_browser=True, ) spotify = spotipy.Spotify(auth_manager=oauth) # Read the currently playing track current_track = spotify.current_user_playing_track() - + # If nothing is playing if not current_track: print("Nothing is currently playing", file=sys.stderr) return 1 - + # Display info if args.url: print(current_track["item"]["external_urls"]["spotify"]) else: print(current_track["item"]["id"]) - + return 0 diff --git a/scripts/spotify-now-playing b/scripts/spotify-now-playing index 1d05cea..549c8b4 100755 --- a/scripts/spotify-now-playing +++ b/scripts/spotify-now-playing @@ -4,7 +4,7 @@ import argparse import sys import logging import spotipy -import pyonepassword +import subprocess from pathlib import Path from spotipy.oauth2 import SpotifyOAuth from rich.console import Console @@ -29,22 +29,20 @@ def main() -> int: format="%(levelname)s: %(message)s", ) - # Connect to 1Password - try: - op = pyonepassword.OP() - except Exception as e: - print(f"Failed to connect to 1Password: {e}", file=sys.stderr) - return 1 - - # Read API credentials - spotify_creds = op.item_get("rio7e6skp6bhkkcdo5w3kmabgq", vault="ewconfig") + # Read API credentials from 1Password + client_id = subprocess.check_output( + "op read -n 'op://ewconfig/rio7e6skp6bhkkcdo5w3kmabgq/Client ID'", shell=True + ).decode("utf-8") + client_secret = subprocess.check_output( + "op read -n 'op://ewconfig/rio7e6skp6bhkkcdo5w3kmabgq/credential'", shell=True + ).decode("utf-8") # Connect to Spotify cache_path = Path("~/.cache/spotipy/spotify-now-playing.oauth").expanduser() cache_path.parent.mkdir(parents=True, exist_ok=True) oauth = SpotifyOAuth( - client_id=spotify_creds.first_field_by_label("Client ID").value, - client_secret=spotify_creds.first_field_by_label("credential").value, + client_id=client_id, + client_secret=client_secret, redirect_uri="http://localhost:8933", scope="user-read-playback-state,user-read-currently-playing", cache_path=cache_path.as_posix(), diff --git a/scripts/trello-dump-card b/scripts/trello-dump-card index 305bf2f..483db48 100755 --- a/scripts/trello-dump-card +++ b/scripts/trello-dump-card @@ -2,7 +2,7 @@ import argparse import sys import logging -import pyonepassword +import subprocess import requests import json @@ -27,22 +27,21 @@ def main() -> int: format="%(levelname)s: %(message)s", ) - # Connect to 1Password - try: - op = pyonepassword.OP() - except Exception as e: - print(f"Failed to connect to 1Password: {e}", file=sys.stderr) - return 1 - # Read API credentials - trello_creds = op.item_get("cbnd5vv3germmc4korkxx3nsim", vault="ewconfig") + trello_api_key = subprocess.check_output( + "op read -n 'op://ewconfig/cbnd5vv3germmc4korkxx3nsim/api key'", shell=True + ).decode() + trello_api_token = subprocess.check_output( + "op read -n 'op://ewconfig/cbnd5vv3germmc4korkxx3nsim/credential'", + shell=True, + ).decode() # Get all cards response = requests.get( f"https://api.trello.com/1/boards/{args.board}/cards", params={ - "key": trello_creds.first_field_by_label("api key").value, - "token": trello_creds.first_field_by_label("credential").value, + "key": trello_api_key, + "token": trello_api_token, }, ) response.raise_for_status()