From 201c5b6f8fa096315b4b80115b4f92b13d5f62d9 Mon Sep 17 00:00:00 2001 From: iawia002 Date: Fri, 1 Jun 2018 12:08:33 +0800 Subject: [PATCH] =?UTF-8?q?extractors/weibo:=20=F0=9F=94=A7=20weibo.com=20?= =?UTF-8?q?url,=20fix=20#156=20[ci=20skip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extractors/weibo.go | 8 ++++++-- extractors/weibo_test.go | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/extractors/weibo.go b/extractors/weibo.go index e94733e9c..e300d3abe 100644 --- a/extractors/weibo.go +++ b/extractors/weibo.go @@ -11,8 +11,12 @@ import ( // Weibo download function func Weibo(url string) downloader.VideoData { if !strings.Contains(url, "m.weibo.cn") { - statusID := utils.MatchOneOf(url, `weibo\.com/tv/v/([^\?/]+)`)[1] - url = "https://m.weibo.cn/status/" + statusID + statusID := utils.MatchOneOf(url, `weibo\.com/tv/v/([^\?/]+)`) + if statusID != nil { + url = "https://m.weibo.cn/status/" + statusID[1] + } else { + url = strings.Replace(url, "weibo.com", "m.weibo.cn", 1) + } } html := request.Get(url, url, nil) title := utils.MatchOneOf(html, `"content2": "(.+?)",`)[1] diff --git a/extractors/weibo_test.go b/extractors/weibo_test.go index e3cdb3fa9..dfca3bb59 100644 --- a/extractors/weibo_test.go +++ b/extractors/weibo_test.go @@ -33,10 +33,18 @@ func TestWeibo(t *testing.T) { name: "title test", args: test.Args{ URL: "https://m.weibo.cn/status/4237529215145705", - Title: `近日,日本视错觉大师、明治大学特任教授\"杉原厚吉的“错觉箭头“作品又引起世界人民的关注。反射,透视和视角的巧妙结合产生了这种惊人的幻觉:箭头向右?转过来还是向右?\n\n引用杉原教授的经典描述:“我们看外面的世界的方式——也就是我们的知觉——都是由大脑机制间接产生的,所以所有知觉在某`, + Title: `近日,日本视错觉大师、明治大学特任教授\"杉原厚吉的“错觉箭头“作品又引起世界人民的关注。反射,透视和视角的巧妙结合产生了这种惊人的幻觉:箭头向右?转过来...`, Size: 1125984, }, }, + { + name: "weibo.com test", + args: test.Args{ + URL: "https://weibo.com/1642500775/GjbO5ByzE", + Title: "让人怦然心动的小姐姐们 via@大懒糖", + Size: 9198410, + }, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) {