diff --git a/README.md b/README.md index d913ca3e..c8f6bf05 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Fork me on GitHub: * Google Drive * Tumblr * Vine +* Instagram * SoundCloud * Mixcloud * Freesound @@ -239,6 +240,7 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y * Google Drive * Tumblr * Vine +* Instagram * SoundCloud * Mixcloud * Freesound diff --git a/README.txt b/README.txt index 88572c34..c544103a 100644 --- a/README.txt +++ b/README.txt @@ -25,6 +25,7 @@ Supported Sites (As of Now) * Google Drive http://docs.google.com * Tumblr http://www.tumblr.com * Vine http://vine.co +* Instagram http://instagram.com * SoundCloud http://soundcloud.com * Mixcloud http://www.mixcloud.com * Freesound http://www.freesound.org diff --git a/src/you_get/__main__.py b/src/you_get/__main__.py index bf23019d..00ea834f 100644 --- a/src/you_get/__main__.py +++ b/src/you_get/__main__.py @@ -34,6 +34,7 @@ def url_to_module(url): 'iask': sina, 'ifeng': ifeng, 'in': alive, + 'instagram': instagram, 'iqiyi': iqiyi, 'joy': joy, 'kankanews': bilibili, diff --git a/src/you_get/downloader/__init__.py b/src/you_get/downloader/__init__.py index 2cb2588d..644b1bc6 100644 --- a/src/you_get/downloader/__init__.py +++ b/src/you_get/downloader/__init__.py @@ -13,6 +13,7 @@ from .facebook import * from .freesound import * from .google import * from .ifeng import * +from .instagram import * from .iqiyi import * from .joy import * from .ku6 import * diff --git a/src/you_get/downloader/instagram.py b/src/you_get/downloader/instagram.py new file mode 100644 index 00000000..f73e23fe --- /dev/null +++ b/src/you_get/downloader/instagram.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +__all__ = ['instagram_download'] + +from ..common import * + +def instagram_download(url, output_dir = '.', merge = True, info_only = False): + html = get_html(url) + + id = r1(r'instagram.com/p/([^/]+)/', html) + description = r1(r'