fixes #5 - oauth relative path

jaymoulin · Mar 20, 2018 · c2a48ad · c2a48ad
1 parent 736d402
commit c2a48ad
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/auth/google_music_manager_auth/auth.py b/auth/google_music_manager_auth/auth.py
@@ -3,20 +3,20 @@
 
 # Usage ./auth.py [path_to_oauth_cred_file=~/oauth]
 
-import sys
+import sys, os
 from gmusicapi import Musicmanager
 
 __all__ = ['auth']
 
 
-def auth(auth_file='~/oauth'):
+def auth(auth_file=os.environ['HOME'] + '/oauth'):
     api = Musicmanager()
     if api.perform_oauth(auth_file):
         print("Logged successfully")
 
 
 def main():
-    auth(sys.argv[1] if len(sys.argv) > 1 else '~/oauth')
+    auth(sys.argv[1] if len(sys.argv) > 1 else os.environ['HOME'] + '/oauth')
 
 
 if __name__ == "__main__":

diff --git a/auth/setup.py b/auth/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '0.7.2'
+__version__ = '0.7.3'
 
 setup(
     name='google_music_manager_auth',

diff --git a/downloader/google_music_manager_downloader/download.py b/downloader/google_music_manager_downloader/download.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import sys, time, logging, os.path, argparse
+import sys, time, logging, os.path, argparse, os
 from gmusicapi import Musicmanager
 
 __all__ = ['download']
 
 
-def download(directory=".", oauth="~/oauth"):
+def download(directory=".", oauth=os.environ['HOME'] + "/oauth"):
     logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger(__name__)
     logger.info("Init Daemon - Press Ctrl+C to quit")
@@ -32,7 +32,7 @@ def download(directory=".", oauth="~/oauth"):
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--directory", '-d', default='.', help="Music Folder to download to (default: .)")
-    parser.add_argument("--oauth", '-a', default='~/oauth', help="Path to oauth file (default: ~/oauth)")
+    parser.add_argument("--oauth", '-a', default=os.environ['HOME'] + '/oauth', help="Path to oauth file (default: ~/oauth)")
     args = parser.parse_args()
     download(args.directory, args.oauth)
 

diff --git a/downloader/setup.py b/downloader/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '0.7.2'
+__version__ = '0.7.3'
 
 setup(
     name='google_music_manager_downloader',

diff --git a/uploader/google_music_manager_uploader/uploader_daemon.py b/uploader/google_music_manager_uploader/uploader_daemon.py
@@ -28,7 +28,7 @@ def on_created(self, event):
                 os.remove(event.src_path)
 
 
-def upload(directory='.', oauth='~/oauth', remove=False,
+def upload(directory='.', oauth=os.environ['HOME'] + '/oauth', remove=False,
            uploader_id=netifaces.ifaddresses('eth0')[netifaces.AF_LINK][0]['addr'].upper()):
     logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger(__name__)
@@ -65,7 +65,7 @@ def upload(directory='.', oauth='~/oauth', remove=False,
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--directory", '-d', default='.', help="Music Folder to upload from (default: .)")
-    parser.add_argument("--oauth", '-a', default='~/oauth', help="Path to oauth file (default: ~/oauth)")
+    parser.add_argument("--oauth", '-a', default=os.environ['HOME'] + '/oauth', help="Path to oauth file (default: ~/oauth)")
     parser.add_argument("-r", "--remove", action='store_true', help="Remove files if present (default: False)")
     parser.add_argument("--uploader_id", '-u',
                         default=netifaces.ifaddresses('eth0')[netifaces.AF_LINK][0]['addr'].upper(),

diff --git a/uploader/setup.py b/uploader/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '0.7.2'
+__version__ = '0.7.3'
 
 setup(
     name='google_music_manager_uploader',