Release of version 1.2.1

- State in README.rst and setup.py metainfo that we require Python>=3.5

- Let Travis-CI test against newer versions of Python

- Let instaloader --help show where to report issues

.travis.yml

@@ -1,11 +1,12 @@
 language: python
 python:
- - "3.3"
- - "3.4"
  - "3.5"
  - "3.5-dev"
+ - "3.6"
+ - "3.6-dev"
+ - "3.7-dev"
  - "nightly"
 install:
  - pip install pylint requests
 script:
- - python3 -m pylint -r n -d bad-whitespace,bad-continuation,missing-docstring,multiple-imports,too-many-arguments,locally-disabled instaloader
+ - python3 -m pylint -r n -d bad-whitespace,bad-continuation,missing-docstring,multiple-imports,too-many-arguments,locally-disabled,line-too-long,invalid-sequence-index instaloader

README.md

@@ -1,103 +0,0 @@
-# instaloader
-
-Tool to download pictures (or videos) and captions from Instagram, from a given set
-of profiles, from your feed or from all followees of a given profile.
-
-## Usage
-
-instaloader is written in Python, thus ensure having
-[Python](https://www.python.org/) (at least version 3.3) installed.
-
-If you intend to use this tool under Windows, it is highly recommended to first install
-[win-unicode-console](https://pypi.python.org/pypi/win_unicode_console).
-
-After having [downloaded instaloader](https://github.com/Thammus/instaloader/releases), unzip it and
-invoke bundled `setup.py` (requiring [setuptools](https://pypi.python.org/pypi/setuptools)) to
-install it:
-```
-./setup.py install [--user]
-```
-(pass `--user` to install it for your user only instead of globally)
-instaloader requires [python3-requests](https://pypi.python.org/pypi/requests/), which will be
-installed automatically by setup.py, if not already installed.
-
-Now, to download a set of profiles, do
-```
-instaloader profile [profile ...]
-```
-where `profile` is the name of a profile you want to download. Instead of only one profile, you may
-also specify a list of profiles.
-
-To later update your local copy of that profile, you may run
-```
-instaloader --fast-update profile [profile ...]
-```
-When `--fast-update` is given, instaloder terminates when arriving at the first already-downloaded
-picture.
-
-Instaloader can also be used to **download private profiles**. To do so, invoke it with
-```
-instaloader --login=your_username profile [profile ...]
-```
-When invoked like this, it also **stores the session cookies** in a file in `/tmp`, which will be
-reused later when `--login` is given. So you can download private profiles **non-interactively**
-when you already have a valid session cookies file.
-
-If you want to **download all followees of a given profile**, call
-```
-instaloader --login=your_username @profile
-```
-
-To **download all the pictures which you have liked**, call
-```
-instaloader --login=your_username :feed-liked
-```
-
-The `--quiet` option makes it also **suitable as a cron job**.
-
-To get a list of other helpful flags, run `instaloader --help`.
-
-## Usage as library
-
-You may also use parts of instaloader as library to do other interesting things.
-
-For example, to get a list of all followers of a profile as well as their follower count, do
-```python
-import instaloader
-
-# login
-session = instaloader.get_logged_in_session(USERNAME)
-
-# get followees
-followees = instaloader.get_followees(PROFILE, session)
-for f in followees:
-    print("%i\t%s\t%s" % (f['follower_count'], f['username'], f['full_name']))
-```
-
-Then, you may download all pictures of all followees with
-```python
-for f in followees:
-    try:
-        instaloader.download(f['username'], session)
-    except instaloader.NonfatalException:
-        pass
-```
-
-You could also download your last 20 liked pics with
-```python
-instaloader.download_feed_pics(session, max_count=20, fast_update=True,
-                               filter_func=lambda node: not node["likes"]["viewer_has_liked"])
-```
-
-Each Instagram profile has its own unique ID which stays unmodified even if a user changes his/her
-username. To get said ID, given the profile's name, you may call
-```python
-instaloader.get_id_by_username(PROFILE_NAME)
-```
-
-`get_followees()` also returns unique IDs for all loaded followees. To get the current username of a
-profile, given this unique ID
-`get_username_by_id()` can be used. For example:
-```python
-instaloader.get_username_by_id(session, followees[0]['id'])
-```

README.rst

@@ -0,0 +1,138 @@
+Instaloader
+===========
+
+
+Installation
+------------
+
+Instaloader is written in Python, thus ensure having
+`Python <https://www.python.org/>`__ (at least version 3.5) installed.
+
+If you intend to use this tool under Windows, it is recommended
+to install
+`win-unicode-console <https://pypi.python.org/pypi/win_unicode_console>`__.
+
+If you have `pip <https://pypi.python.org/pypi/pip>`__ installed, you
+may install Instaloader using
+
+::
+
+    pip3 install instaloader
+
+Alternatively, you may `download Instaloader from
+GitHub <https://github.com/Thammus/instaloader/releases>`__, unzip it
+and invoke bundled ``setup.py`` (requiring
+`setuptools <https://pypi.python.org/pypi/setuptools>`__) to install it:
+
+::
+
+    python3 setup.py install [--user]
+
+(pass ``--user`` to install it for your user only instead of globally)
+
+Instaloader requires
+`requests <https://pypi.python.org/pypi/requests>`__, which
+will be installed automatically by setup.py, if not already installed.
+
+How to automatically download pictures from Instagram
+-----------------------------------------------------
+
+To download a set of profiles, do
+
+::
+
+    instaloader profile [profile ...]
+
+where ``profile`` is the name of a profile you want to download. Instead
+of only one profile, you may also specify a list of profiles.
+
+To later update your local copy of that profile, you may run
+
+::
+
+    instaloader --fast-update profile [profile ...]
+
+When ``--fast-update`` is given, Instaloader terminates when arriving at
+the first already-downloaded picture.
+
+Instaloader can also be used to **download private profiles**. To do so,
+invoke it with
+
+::
+
+    instaloader --login=your_username profile [profile ...]
+
+When invoked like this, it also **stores the session cookies** in a file
+in ``/tmp``, which will be reused later when ``--login`` is given. So
+you can download private profiles **non-interactively** when you already
+have a valid session cookie file.
+
+If you want to **download all followees of a given profile**, call
+
+::
+
+    instaloader --login=your_username @profile
+
+To **download all the pictures from your feed which you have liked**, call
+
+::
+
+    instaloader --login=your_username :feed-liked
+
+The ``--quiet`` option makes it also **suitable as a cron job**.
+
+To get a list of other helpful flags, run ``instaloader --help``.
+
+Usage as library
+----------------
+
+You may also use parts of Instaloader as library to do other interesting
+things.
+
+For example, to get a list of all followers of a profile as well as
+their follower count, do
+
+.. code:: python
+
+    import instaloader
+
+    # login
+    session = instaloader.get_logged_in_session(USERNAME)
+
+    # get followees
+    followees = instaloader.get_followees(PROFILE, session)
+    for f in followees:
+        print("%i\t%s\t%s" % (f['follower_count'], f['username'], f['full_name']))
+
+Then, you may download all pictures of all followees with
+
+.. code:: python
+
+    for f in followees:
+        try:
+            instaloader.download(f['username'], session)
+        except instaloader.NonfatalException:
+            pass
+
+You could also download your last 20 liked pics with
+
+.. code:: python
+
+    instaloader.download_feed_pics(session, max_count=20, fast_update=True,
+                                   filter_func=lambda node: not node["likes"]["viewer_has_liked"])
+
+Each Instagram profile has its own unique ID which stays unmodified even
+if a user changes his/her username. To get said ID, given the profile's
+name, you may call
+
+.. code:: python
+
+    instaloader.get_id_by_username(PROFILE_NAME)
+
+``get_followees()`` also returns unique IDs for all loaded followees. To
+get the current username of a profile, given this unique ID
+``get_username_by_id()`` can be used. For example:
+
+.. code:: python
+
+    instaloader.get_username_by_id(session, followees[0]['id'])

instaloader.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
 
 """Tool to download pictures (or videos) and captions from Instagram, from a given set
-of profiles, from your feed or from all followees of a given profile."""
+of profiles (even if private), from your feed or from all followees of a given profile."""
 
 import re, json, datetime, shutil, os, time, random, sys, pickle, getpass, tempfile
 from argparse import ArgumentParser
 from io import BytesIO
+from numbers import Real
+from typing import List, Optional, Any, Dict, Callable
+
 import requests, requests.utils
 
 # To get version from setup.py for instaloader --version
@@ -58,10 +61,12 @@ def _log(*msg, sep='', end='\n', flush=False, quiet=False):
         print(*msg, sep=sep, end=end, flush=flush)
 
 
-def get_json(name, session, max_id=0, sleep=True):
+def get_json(name: str, session: requests.Session, max_id: int = 0, sleep: bool = True) -> Optional[Dict[str, Any]]:
     """Return JSON of a profile"""
-    resp = session.get('http://www.instagram.com/'+name, \
-        params={'max_id': max_id})
+    if max_id == 0:
+        resp = session.get('https://www.instagram.com/'+name)
+    else:
+        resp = session.get('https://www.instagram.com/'+name, params={'max_id': max_id})
     if sleep:
         time.sleep(4 * random.random() + 1)
     match = re.search('window\\._sharedData = .*<', resp.text)
@@ -71,7 +76,7 @@ def get_json(name, session, max_id=0, sleep=True):
         return json.loads(match.group(0)[21:-2])
 
 
-def get_username_by_id(session, profile_id):
+def get_username_by_id(session: requests.Session, profile_id: int) -> str:
     """To get the current username of a profile, given its unique ID, this function can be used.
     session is required to be a logged-in (i.e. non-anonymous) session."""
     tempsession = copy_session(session)
@@ -92,20 +97,20 @@ def get_username_by_id(session, profile_id):
                                         str(profile_id) + ").")
 
 
-def get_id_by_username(profile):
+def get_id_by_username(profile: str) -> int:
     """Each Instagram profile has its own unique ID which stays unmodified even if a user changes
     his/her username. To get said ID, given the profile's name, you may call this function."""
     data = get_json(profile, get_anonymous_session())
-    if len(data["entry_data"]) == 0 or "ProfilePage" not in data("entry_data"):
+    if len(data["entry_data"]) == 0 or "ProfilePage" not in data["entry_data"]:
         raise ProfileNotExistsException("Profile {0} does not exist.".format(profile))
     return int(data['entry_data']['ProfilePage'][0]['user']['id'])
 
 
-def _epoch_to_string(epoch):
+def _epoch_to_string(epoch: Real) -> str:
     return datetime.datetime.fromtimestamp(epoch).strftime('%Y-%m-%d_%H-%M-%S')
 
 
-def get_followees(profile, session):
+def get_followees(profile: str, session: requests.Session) -> List[Dict[str, Any]]:
     """
     Retrieve list of followees of given profile
 
@@ -162,7 +167,7 @@ def get_followees(profile, session):
     raise LoginRequiredException("Login required to gather followees.")
 
 
-def download_pic(name, url, date_epoch, outputlabel=None, quiet=False):
+def download_pic(name: str, url: str, date_epoch: Real, outputlabel: Optional[str] = None, quiet: bool = False) -> bool:
     """Downloads and saves picture with given url under given directory with given timestamp.
     Returns true, if file was actually downloaded, i.e. updated."""
     if outputlabel is None:
@@ -186,7 +191,7 @@ def download_pic(name, url, date_epoch, outputlabel=None, quiet=False):
         raise ConnectionException("File \'" + url + "\' could not be downloaded.")
 
 
-def save_caption(name, date_epoch, caption, shorter_output=False, quiet=False):
+def save_caption(name: str, date_epoch: Real, caption: str, shorter_output: bool = False, quiet: bool = False) -> None:
     """Updates picture caption"""
     filename = name.lower() + '/' + _epoch_to_string(date_epoch) + '.txt'
     pcaption = caption.replace('\n', ' ').strip()
@@ -206,7 +211,7 @@ def save_caption(name, date_epoch, caption, shorter_output=False, quiet=False):
             return None
         else:
             def get_filename(index):
-                return filename if index==0 else (filename[:-4] + '_old_' + \
+                return filename if index==0 else (filename[:-4] + '_old_' +
                         (str(0) if index<10 else str()) + str(index) + filename[-4:])
             i = 0
             while os.path.isfile(get_filename(i)):
@@ -229,7 +234,18 @@ def save_caption(name, date_epoch, caption, shorter_output=False, quiet=False):
     os.utime(filename, (datetime.datetime.now().timestamp(), date_epoch))
 
 
-def download_profilepic(name, url, quiet=False):
+def save_location(name: str, location_json: Dict[str, str], date_epoch: Real) -> None:
+    filename = name.lower() + '/' + _epoch_to_string(date_epoch) + '_location.txt'
+    location_string = location_json["name"]+"\n" + \
+                      "https://maps.google.com/maps?q={0},{1}&ll={0},{1}\n" \
+                          .format(location_json["lat"], location_json["lng"])
+    os.makedirs(name.lower(), exist_ok=True)
+    with open(filename, 'wb') as text_file:
+        shutil.copyfileobj(BytesIO(location_string.encode()), text_file)
+    os.utime(filename, (datetime.datetime.now().timestamp(), date_epoch))
+
+
+def download_profilepic(name: str, url: str, quiet: bool = False) -> None:
     """Downloads and saves profile pic with given url."""
     date_object = datetime.datetime.strptime(requests.head(url).headers["Last-Modified"], \
         '%a, %d %b %Y %H:%M:%S GMT')
@@ -256,14 +272,14 @@ def download_profilepic(name, url, quiet=False):
         raise ConnectionException("File \'" + url + "\' could not be downloaded.")
 
 
-def get_default_session_filename(username):
+def get_default_session_filename(username: str) -> str:
     """Returns default session filename for given username."""
     dirname = tempfile.gettempdir() + "/" + ".instaloader-" + getpass.getuser()
     filename = dirname + "/" + "session-" + username
     return filename
 
 
-def save_session(session, username, filename=None, quiet=False):
+def save_session(session: requests.Session, username: str, filename: Optional[str] = None, quiet: bool = False) -> None:
     """Saves requests.Session object."""
     if filename is None:
         filename = get_default_session_filename(username)
@@ -277,7 +293,7 @@ def save_session(session, username, filename=None, quiet=False):
         _log("Saved session to %s." % filename, quiet=quiet)
 
 
-def load_session(username, filename=None, quiet=False):
+def load_session(username: str, filename: Optional[str] = None, quiet: bool = False) -> requests.Session:
     """Returns loaded requests.Session object, or None if not found."""
     if filename is None:
         filename = get_default_session_filename(username)
@@ -293,7 +309,7 @@ def load_session(username, filename=None, quiet=False):
         pass
 
 
-def copy_session(session):
+def copy_session(session: requests.Session) -> requests.Session:
     """Duplicates a requests.Session."""
     new = requests.Session()
     new.cookies = \
@@ -302,7 +318,7 @@ def copy_session(session):
     return new
 
 
-def test_login(session):
+def test_login(session: requests.Session) -> Optional[str]:
     """Returns the Instagram username to which given requests.Session object belongs, or None."""
     if session is None:
         return
@@ -313,7 +329,7 @@ def test_login(session):
     return data['config']['viewer']['username']
 
 
-def default_http_header(empty_session_only=False):
+def default_http_header(empty_session_only: bool = False) -> Dict[str, str]:
     """Returns default HTTP header we use for requests."""
     user_agent = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 ' \
                 '(KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36'
@@ -336,7 +352,7 @@ def default_http_header(empty_session_only=False):
     return header
 
 
-def get_anonymous_session():
+def get_anonymous_session() -> requests.Session:
     """Returns our default anonymous requests.Session object."""
     session = requests.Session()
     session.cookies.update({'sessionid' : '', 'mid' : '', 'ig_pr' : '1', \
@@ -346,7 +362,7 @@ def get_anonymous_session():
     return session
 
 
-def get_session(user, passwd):
+def get_session(user: str, passwd: str) -> requests.Session:
     """Log in to instagram with given username and password and return session object"""
     session = requests.Session()
     session.cookies.update({'sessionid' : '', 'mid' : '', 'ig_pr' : '1', \
@@ -369,7 +385,7 @@ def get_session(user, passwd):
         raise ConnectionException('Login error! Connection error!')
 
 
-def get_feed_json(session, end_cursor=None, sleep=True):
+def get_feed_json(session: requests.Session, end_cursor: str = None, sleep: bool = True) -> Dict[str, Any]:
     """
     Get JSON of the user's feed.
 
@@ -414,8 +430,18 @@ def get_feed_json(session, end_cursor=None, sleep=True):
     return json.loads(resp.text)
 
 
-def download_node(node, session, name,
-                  download_videos=True, sleep=True, shorter_output=False, quiet=False):
+def get_location(node: Dict[str, str], session: requests.Session, sleep: bool = True) -> Dict[str, str]:
+    pic_json = get_json("p/" + node["code"], session, sleep=sleep)
+    if pic_json["entry_data"]["PostPage"][0]["media"]["location"] is not None:
+        location_json = get_json("explore/locations/" +
+                                 pic_json["entry_data"]["PostPage"][0]["media"]["location"]["id"],
+                                 session, sleep=sleep)
+        return location_json["entry_data"]["LocationsPage"][0]["location"]
+
+
+def download_node(node: Dict[str, Any], session: requests.Session, name: str,
+                  download_videos: bool = True, geotags: bool = False,
+                  sleep: bool = True, shorter_output: bool = False, quiet: bool = False) -> bool:
     """
     Download everything associated with one instagram node, i.e. picture, caption and video.
 
@@ -423,6 +449,7 @@ def download_node(node, session, name,
     :param session: Session
     :param name: Name of profile to which this node belongs
     :param download_videos: True, if videos should be downloaded
+    :param geotags: Download geotags
     :param sleep: Sleep between requests to instagram server
     :param shorter_output: Shorten log output by not printing captions
     :param quiet: Suppress output
@@ -440,12 +467,18 @@ def download_node(node, session, name,
         download_pic(name,
                      video_data['entry_data']['PostPage'][0]['media']['video_url'],
                      node["date"], 'mp4', quiet=quiet)
+    if geotags:
+        location = get_location(node, session, sleep)
+        if location:
+            save_location(name, location, node["date"])
     _log(quiet=quiet)
     return downloaded
 
 
-def download_feed_pics(session, max_count=None, fast_update=False, filter_func=None,
-                       download_videos=True, shorter_output=False, sleep=True, quiet=False):
+def download_feed_pics(session: requests.Session, max_count: int = None, fast_update: bool = False,
+                       filter_func: Optional[Callable[[Dict[str, Dict[str, Any]]], bool]] = None,
+                       download_videos: bool = True, geotags: bool = False,
+                       shorter_output: bool = False, sleep: bool = True, quiet: bool = False) -> None:
     """
     Download pictures from the user's feed.
 
@@ -458,6 +491,7 @@ def download_feed_pics(session, max_count=None, fast_update=False, filter_func=N
     :param fast_update: If true, abort when first already-downloaded picture is encountered
     :param filter_func: function(node), which returns True if given picture should not be downloaded
     :param download_videos: True, if videos should be downloaded
+    :param geotags: Download geotags
     :param shorter_output: Shorten log output by not printing captions
     :param sleep: Sleep between requests to instagram server
     :param quiet: Suppress output
@@ -475,15 +509,15 @@ def download_feed_pics(session, max_count=None, fast_update=False, filter_func=N
             _log("[%3i] %s " % (count, name), end="", flush=True, quiet=quiet)
             count += 1
             downloaded = download_node(node, session, name,
-                                       download_videos=download_videos, sleep=sleep,
-                                       shorter_output=shorter_output, quiet=quiet)
+                                       download_videos=download_videos, geotags=geotags,
+                                       sleep=sleep, shorter_output=shorter_output, quiet=quiet)
             if fast_update and not downloaded:
                 return
         data = get_feed_json(session, end_cursor=data["feed"]["media"]["page_info"]["end_cursor"],
                              sleep=sleep)
 
 
-def check_id(profile, session, json_data, quiet=False):
+def check_id(profile: str, session: requests.Session, json_data: Dict[str, Any], quiet: bool = False) -> str:
     """
     Consult locally stored ID of profile with given name, check whether ID matches and whether name
     has changed and return current name of the profile, and store ID of profile.
@@ -520,10 +554,11 @@ def check_id(profile, session, json_data, quiet=False):
     raise ProfileNotExistsException("Profile {0} does not exist.".format(profile))
 
 
-def download(name, session, profile_pic_only=False, download_videos=True,
-        fast_update=False, shorter_output=False, sleep=True, quiet=False):
+def download(name: str, session: requests.Session, profile_pic_only: bool = False, download_videos: bool = True,
+             geotags: bool = False,
+             fast_update: bool = False, shorter_output: bool = False, sleep: bool = True, quiet: bool = False) -> None:
     """Download one profile"""
-    # pylint:disable=too-many-branches
+    # pylint:disable=too-many-branches,too-many-locals
     # Get profile main page json
     data = get_json(name, session, sleep=sleep)
     # check if profile does exist or name has changed since last download
@@ -567,13 +602,14 @@ def download(name, session, profile_pic_only=False, download_videos=True,
             _log("[%3i/%3i] " % (count, totalcount), end="", flush=True, quiet=quiet)
             count += 1
             downloaded = download_node(node, session, name,
-                                       download_videos=download_videos, sleep=sleep,
-                                       shorter_output=shorter_output, quiet=quiet)
+                                       download_videos=download_videos, geotags=geotags,
+                                       sleep=sleep, shorter_output=shorter_output, quiet=quiet)
             if fast_update and not downloaded:
                 return
         data = get_json(name, session, max_id=get_last_id(data), sleep=sleep)
 
-def get_logged_in_session(username, password=None, quiet=False):
+
+def get_logged_in_session(username: str, password: Optional[str] = None, quiet: bool = False) -> requests.Session:
     """Logs in and returns session, asking user for password if needed"""
     if password is not None:
         return get_session(username, password)
@@ -588,9 +624,12 @@ def get_logged_in_session(username, password=None, quiet=False):
             print(err, file=sys.stderr)
             password = None
 
-def download_profiles(profilelist, username=None, password=None, sessionfile=None,
-        profile_pic_only=False, download_videos=True, fast_update=False,
-        sleep=True, shorter_output=False, quiet=False):
+
+def download_profiles(profilelist: List[str], username: Optional[str] = None, password: Optional[str] = None,
+                      sessionfile: Optional[str] = None,
+                      profile_pic_only: bool = False, download_videos: bool = True, geotags: bool = False,
+                      fast_update: bool = False,
+                      sleep: bool = True, shorter_output: bool = False, quiet: bool = False) -> None:
     """Download set of profiles and handle sessions"""
     # pylint:disable=too-many-branches,too-many-locals
     # Login, if desired
@@ -614,14 +653,14 @@ def download_profiles(profilelist, username=None, password=None, sessionfile=Non
             elif pentry == ":feed-all" and username is not None:
                 _log("Retrieving pictures from your feed...", quiet=quiet)
                 download_feed_pics(session, fast_update=fast_update,
-                                   download_videos=download_videos, shorter_output=shorter_output,
-                                   sleep=sleep, quiet=quiet)
+                                   download_videos=download_videos, geotags=geotags,
+                                   shorter_output=shorter_output, sleep=sleep, quiet=quiet)
             elif pentry == ":feed-liked" and username is not None:
                 _log("Retrieving pictures you liked from your feed...", quiet=quiet)
                 download_feed_pics(session, fast_update=fast_update,
                                    filter_func=lambda node: not node["likes"]["viewer_has_liked"],
-                                   download_videos=download_videos, shorter_output=shorter_output,
-                                   sleep=sleep, quiet=quiet)
+                                   download_videos=download_videos, geotags=geotags,
+                                   shorter_output=shorter_output, sleep=sleep, quiet=quiet)
             else:
                 targets.add(pentry)
         if len(targets) == 0:
@@ -632,7 +671,7 @@ def download_profiles(profilelist, username=None, password=None, sessionfile=Non
         for target in targets:
             try:
                 download(target, session, profile_pic_only, download_videos,
-                        fast_update, shorter_output, sleep, quiet)
+                        geotags, fast_update, shorter_output, sleep, quiet)
             except NonfatalException as err:
                 failedtargets.append(target)
                 print(err, file=sys.stderr)
@@ -646,7 +685,8 @@ def download_profiles(profilelist, username=None, password=None, sessionfile=Non
         save_session(session, username, sessionfile, quiet=quiet)
 
 def main():
-    parser = ArgumentParser(description=__doc__)
+    parser = ArgumentParser(description=__doc__,
+                            epilog="Report issues at https://github.com/Thammus/instaloader/issues.")
     parser.add_argument('profile', nargs='*',
                         help='Name of profile to download; @<profile> to download all followees of '
                              '<profile>; or the special targets :feed-all or :feed-liked to '
@@ -670,6 +710,8 @@ def main():
             help='Only download profile picture')
     parser.add_argument('-V', '--skip-videos', action='store_true',
             help='Do not download videos')
+    parser.add_argument('-G', '--geotags', action='store_true',
+            help='Store geotags when available')
     parser.add_argument('-F', '--fast-update', action='store_true',
             help='Abort at encounter of first already-downloaded picture')
     parser.add_argument('-S', '--no-sleep', action='store_true',
@@ -682,7 +724,7 @@ def main():
     args = parser.parse_args()
     try:
         download_profiles(args.profile, args.login, args.password, args.sessionfile,
-                args.profile_pic_only, not args.skip_videos, args.fast_update,
+                args.profile_pic_only, not args.skip_videos, args.geotags, args.fast_update,
                 not args.no_sleep, args.shorter_output, args.quiet)
     except InstaloaderException as err:
         raise SystemExit("Fatal error: %s" % err)

setup.py

@@ -1,31 +1,38 @@
 #!/usr/bin/env python3
 
+import sys
 from setuptools import setup
 
+if sys.version_info < (3, 5):
+    sys.exit('Instaloader requires Python >= 3.5.')
+
 setup(
     name='instaloader',
-    version='1.1',
+    version='1.2.1',
     py_modules=['instaloader'],
     url='https://github.com/Thammus/instaloader',
     license='MIT',
     author='Alexander Graf, André Koch-Kramer',
     author_email='mail@agraf.me, koch-kramer@web.de',
-    description='Tool to download pictures (or videos) and captions from Instagram, from a given '
-                'set of profiles, from your feed or from all followees of a given profile.',
+    description='Tool to download Instagram pictures (or videos) and captions from a given set of '
+                'profiles (even if private), from your feed or from all followees of a given '
+                'profile.',
+    long_description=open('README.rst').read(),
     install_requires=['requests>=2.4'],
-    python_requires='>=3.3',
+    python_requires='>=3.5',
     entry_points={'console_scripts': ['instaloader=instaloader:main']},
     zip_safe=True,
     keywords='instagram downloader',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
+        'Intended Audience :: End Users/Desktop',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6'
-        'Topic :: Internet'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3 :: Only',
+        'Topic :: Internet',
+        'Topic :: Multimedia :: Graphics'
     ]
 )