Added user authentication via OAuth

Author: toxygen

README.md

@@ -13,6 +13,14 @@ You can also set your API key and secret in `~/.flickr_download`:
     api_key: my_key
     api_secret: my_secret
 
+User Authentication Support
+===========================
+
+The script also allows you to authenticate as your user account. That way you can download sets that
+are private and public photos that are restricted. To use this mode, pass in `-t` to the script too.
+
+The setup the first time is slightly hacky, but it works :)
+
 Requirements
 ============
 

flickr_download/flick_download.py

@@ -17,9 +17,10 @@
 import yaml
 
 CONFIG_FILE = "~/.flickr_download"
+OAUTH_TOKEN_FILE = "~/.flickr_token"
 
 
-def _init(key, secret):
+def _init(key, secret, oauth):
     """
     Initialize API.
 
@@ -29,6 +30,27 @@ def _init(key, secret):
     @param secret: str, API secret
     """
     Flickr.set_keys(key, secret)
+    if not oauth:
+        return True
+
+    if os.path.exists(os.path.expanduser(OAUTH_TOKEN_FILE)):
+        Flickr.set_auth_handler(os.path.expanduser(OAUTH_TOKEN_FILE))
+        return True
+
+    # Get new OAuth credentials
+    auth = Flickr.auth.AuthHandler()  # creates the AuthHandler object
+    perms = "read"  # set the required permissions
+    url = auth.get_authorization_url(perms)
+    print
+    print "Enter the following url in a browser to authorize the application:"
+    print url
+    print "Copy and paste the <oauth_verifier> value from XML here and press return:"
+    Flickr.set_auth_handler(auth)
+    token = raw_input()
+    auth.set_verifier(token)
+    auth.save(os.path.expanduser(OAUTH_TOKEN_FILE))
+    print "OAuth token was saved, re-run script to use it."
+    return False
 
 
 def _load_defaults():
@@ -99,18 +121,24 @@ def main():
                         help='Flickr API key')
     parser.add_argument('-s', '--api_secret', type=str,
                         help='Flickr API secret')
+    parser.add_argument('-t', '--user_auth', action='store_true',
+                        help='Enable user authentication')
     parser.add_argument('-l', '--list', type=str, metavar='USER',
                         help='List photosets for a user')
     parser.add_argument('-d', '--download', type=str, metavar='SET_ID',
                         help='Download the given set')
     parser.set_defaults(**_load_defaults())
 
     args = parser.parse_args()
+
     if not args.api_key or not args.api_secret:
         print >> sys.stderr, 'You need to pass in both "api_key" and "api_secret" arguments'
         return 1
 
-    _init(args.api_key, args.api_secret)
+    ret = _init(args.api_key, args.api_secret, args.user_auth)
+    if not ret:
+        return 1
+
     if args.list:
         print_sets(args.list)
     elif args.download:

setup.py

@@ -6,12 +6,12 @@ def readme():
         return f.read()
 
 setup(name='flickr_download',
-      version='0.2.2',
+      version='0.2.3',
       description='Download a Flickr set',
       long_description=readme(),
       url='https://github.com/beaufour/flickr-download.git',
-      author='Allan Beaufour',
-      author_email='[email protected]',
+      author='Allan Beaufour, Marian Such',
+      author_email='[email protected], [email protected]',
       license='MIT',
       packages=['flickr_download'],
       install_requires=[