From c7cc66458f32b3c543661caca3b69a00c6340b89 Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Wed, 18 Jun 2014 00:59:05 +0200
Subject: [PATCH] Vine: add video id into title

---
 src/you_get/extractor/instagram.py | 8 ++++----
 src/you_get/extractor/vine.py      | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/you_get/extractor/instagram.py b/src/you_get/extractor/instagram.py
index 6071dfd0..0605a6c3 100644
--- a/src/you_get/extractor/instagram.py
+++ b/src/you_get/extractor/instagram.py
@@ -6,13 +6,13 @@ 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)
+
+    vid = r1(r'instagram.com/p/([^/]+)/', html)
     description = r1(r'<meta property="og:description" content="([^"]*)"', html)
-    title = description + " [" + id + "]"
+    title = description + " [" + vid + "]"
     url = r1(r'<meta property="og:video" content="([^"]*)"', html)
     type, ext, size = url_info(url)
-    
+
     print_info(site_info, title, type, size)
     if not info_only:
         download_urls([url], title, ext, size, output_dir, merge = merge)
diff --git a/src/you_get/extractor/vine.py b/src/you_get/extractor/vine.py
index 35dec2ea..5bcc23b5 100644
--- a/src/you_get/extractor/vine.py
+++ b/src/you_get/extractor/vine.py
@@ -7,9 +7,10 @@ from ..common import *
 def vine_download(url, output_dir='.', merge=True, info_only=False):
     html = get_html(url)
 
+    vid = r1(r'vine.co/v/([^/]+)/', html)
     title1 = r1(r'<meta property="twitter:title" content="([^"]*)"', html)
-    title2 = r1(r'<meta property="og:title" content="([^"]*)"', html)
-    title = "%s - %s" % (title1, title2)
+    title2 = r1(r'<meta property="twitter:description" content="([^"]*)"', html)
+    title = "%s - %s" % (title1, title2) + " [" + vid + "]"
     url = r1(r'<source src="([^"]*)"', html) or r1(r'<meta itemprop="contentURL" content="([^"]*)"', html)
     if url[0:2] == "//":
         url = "http:" + url