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

Danbooru::URL: add #basename, #filename, and #file_ext utility methods.

Browse Source 
Add `#basename`, `#filename`, and `#file_ext` utility methods to
Danbooru::URL and change a few places to use them. Simplifies parsing
filenames in source URLs in various places.
This commit is contained in:
evazion
2022-02-27 00:56:23 -06:00
parent fcf517834d
commit 926a8fa81f
13 changed files with 93 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/source/url/twitter.rb
View File

@@ -87,10 +87,10 @@ class Source::URL::Twitter < Source::URL
# https://pbs.twimg.com/tweet_video_thumb/ETkN_L3X0AMy1aT.jpg
# https://pbs.twimg.com/ext_tw_video_thumb/1243725361986375680/pu/img/JDA7g7lcw7wK-PIv.jpg
# https://pbs.twimg.com/amplify_video_thumb/1215590775364259840/img/lolCkEEioFZTb5dl.jpg
in "twimg.com", ("media" | "tweet_video_thumb" | "ext_tw_video_thumb" | "amplify_video_thumb") => media_type, *subdirs, filename
in "twimg.com", ("media" | "tweet_video_thumb" | "ext_tw_video_thumb" | "amplify_video_thumb") => media_type, *subdirs, file
# EBGbJe_U8AA4Ekb.jpg:small
@filename, @file_size = filename.split(":")
@filename, @file_ext = @filename.split(".")
@file, @file_size = file.split(":")
@file, @file_ext = @file.split(".")
# EBGbJe_U8AA4Ekb?format=jpg&name=900x900
@file_size = params[:name] if params[:name].present?
@@ -98,7 +98,7 @@ class Source::URL::Twitter < Source::URL
# /media/EBGbJe_U8AA4Ekb.jpg
# /ext_tw_video_thumb/1243725361986375680/pu/img/JDA7g7lcw7wK-PIv.jpg
@file_path = File.join(media_type, subdirs.join("/"), "#{@filename}.#{@file_ext}")
@file_path = File.join(media_type, subdirs.join("/"), "#{@file}.#{@file_ext}")
else
end
end