Skip to content

Moved config file to ~/.config and now retrieving password from keyring #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pschmitt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved config file to ~/.config and now retrieving password from keyring #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions thunner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import subprocess
import collections
import sys
import signal

import keyring
from Queue import Queue, Empty
from threading import Thread
from gmusicapi import Webclient
Expand All @@ -54,7 +54,7 @@ def parse_config():
'text':'default' }
config = { 'colors':[], 'assignments':defaultcolors }
try:
with open(os.path.expanduser("~/.thunnerrc")) as f:
with open(os.path.expanduser("~/.config/thunnerrc")) as f:
lines = f.readlines()
for i in lines:
words = i.split()
Expand All @@ -68,9 +68,12 @@ def parse_config():
config['assignments'][words[2]] = words[1]
if 'pass' not in config:
# If Password not in Config, ask for it
config['pass'] = getpass()
k = keyring.get_keyring()
if isinstance(k, keyring.backends.Gnome.Keyring):
k.KEYRING_NAME = 'pwsafe'
config['pass'] = keyring.get_password('google-music', config['email'])
except IOError:
print "Can't find ~/.thunnerrc"
print "Can't find ~/.config/thunnerrc"
sys.exit()
return config

Expand Down