From 8fa57ef85b43f357f436059cc4663d2a28edfa02 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Mon, 12 Oct 2015 20:59:43 +0200
Subject: [PATCH] [flickr] new site support

---
 README.md                          |  1 +
 src/you_get/common.py              |  2 ++
 src/you_get/extractors/__init__.py |  1 +
 src/you_get/extractors/flickr.py   | 29 +++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 src/you_get/extractors/flickr.py

diff --git a/README.md b/README.md
index 0cdcaa70..3130a33f 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Fork me on GitHub: <https://github.com/soimort/you-get>
 ### Supported Sites
 
 * Dailymotion <http://dailymotion.com>
+* Flickr <http://www.flickr.com>
 * Freesound <http://www.freesound.org>
 * Google+ <http://plus.google.com>
 * Instagram <http://instagram.com>
diff --git a/src/you_get/common.py b/src/you_get/common.py
index ff040992..8cca99e6 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -991,6 +991,7 @@ def url_to_module(url):
         douyutv,
         ehow,
         facebook,
+        flickr,
         freesound,
         funshion,
         google,
@@ -1071,6 +1072,7 @@ def url_to_module(url):
         'douyutv': douyutv,
         'ehow': ehow,
         'facebook': facebook,
+        'flickr': flickr,
         'freesound': freesound,
         'fun': funshion,
         'google': google,
diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py
index 180b7652..419169cf 100755
--- a/src/you_get/extractors/__init__.py
+++ b/src/you_get/extractors/__init__.py
@@ -15,6 +15,7 @@ from .douban import *
 from .douyutv import *
 from .ehow import *
 from .facebook import *
+from .flickr import *
 from .freesound import *
 from .funshion import *
 from .google import *
diff --git a/src/you_get/extractors/flickr.py b/src/you_get/extractors/flickr.py
new file mode 100644
index 00000000..5b5bc789
--- /dev/null
+++ b/src/you_get/extractors/flickr.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+__all__ = ['flickr_download']
+
+from ..common import *
+
+def flickr_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
+    html = get_html(url)
+    title = match1(html, r'<meta property="og:title" content="([^"]*)"')
+    photo_id = match1(html, r'"id":"([0-9]+)"')
+
+    html = get_html('https://secure.flickr.com/apps/video/video_mtl_xml.gne?photo_id=%s' % photo_id)
+    node_id = match1(html, r'<Item id="id">(.+)</Item>')
+    secret = match1(html, r'<Item id="photo_secret">(.+)</Item>')
+
+    html = get_html('https://secure.flickr.com/video_playlist.gne?node_id=%s&secret=%s' % (node_id, secret))
+    app = match1(html, r'APP="([^"]+)"')
+    fullpath = unescape_html(match1(html, r'FULLPATH="([^"]+)"'))
+    url = app + fullpath
+
+    mime, ext, size = url_info(url)
+
+    print_info(site_info, title, mime, size)
+    if not info_only:
+        download_urls([url], title, ext, size, output_dir, merge=merge, faker=True)
+
+site_info = "Flickr.com"
+download = flickr_download
+download_playlist = playlist_not_supported('flickr')