jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tumblr: parse new dashboard links

Browse Source
This commit is contained in:
nonamethanks
2022-09-28 16:57:50 +02:00
committed by N. Oname
parent 266fed1b99
commit 5051c6649d
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/logical/source/url/tumblr.rb
View File

@@ -46,7 +46,12 @@ class Source::URL::Tumblr < Source::URL
@blog_name = subdomain unless subdomain == "www" @blog_name = subdomain unless subdomain == "www"
@work_id = work_id @work_id = work_id
# https://www.tumblr.com/blog/view/artofelaineho/187614935612 # https://tumblr.com/munespice/683613396085719040, new dashboard links
in ("tumblr.com" | "www.tumblr.com"), blog_name, /^\d+$/ => work_id
@blog_name = blog_name
@work_id = work_id
# https://www.tumblr.com/blog/view/artofelaineho/187614935612 # old dashboard links
in ("www.tumblr.com" | "tumblr.com"), "blog", "view", blog_name, /^\d+$/ => work_id in ("www.tumblr.com" | "tumblr.com"), "blog", "view", blog_name, /^\d+$/ => work_id
@blog_name = blog_name @blog_name = blog_name
@work_id = work_id @work_id = work_id

10
test/unit/sources/tumblr_test.rb
View File

@@ -176,6 +176,16 @@ module Sources
) )
end end
context "A tumblr.com/$blog_name/$work_id URL" do
strategy_should_work(
"https://tumblr.com/munespice/683613396085719040",
image_urls: ["https://64.media.tumblr.com/fd6b4692f6e902af861fbc242736ae61/010fd31ffbc70e84-a8/s21000x21000/e0587516e05bae4cec244921f220b45bed08335c.jpg"],
artist_name: "munespice",
page_url: "https://munespice.tumblr.com/post/683613396085719040",
profile_url: "https://munespice.tumblr.com"
)
end
context "generating page urls" do context "generating page urls" do
should "work" do should "work" do
source1 = "https://octrain1020.tumblr.com/post/190713122589" source1 = "https://octrain1020.tumblr.com/post/190713122589"