mir/moebooru
2
0
Fork 0
mirror of https://github.com/moebooru/moebooru synced 2025-08-31 22:15:12 +00:00
Code Issues Releases Wiki Activity

Move frame url generation to image stores.

Browse Source
This commit is contained in:
edogawaconan
2014-08-27 16:29:21 +09:00
parent 46f50c9f5f
commit 3c524a91a8
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/post/frame_methods.rb
View File

@@ -34,11 +34,8 @@ module Post::FrameMethods
frame[:preview_height] = size[:height] frame[:preview_height] = size[:height]
filename = PostFrames.filename(frame) filename = PostFrames.filename(frame)
server = Mirrors.select_image_server(frames_warehoused, created_at.to_i + i) frame[:url] = frame_url(filename, i)
frame[:url] = server + "/data/frame/#{filename}" frame[:preview_url] = frame_preview_url(filename, i)
thumb_server = Mirrors.select_image_server(frames_warehoused, created_at.to_i + i, :use_aliases => true)
frame[:preview_url] = thumb_server + "/data/frame-preview/#{filename}"
end end
frames frames

8
app/models/post/image_store/local_flat.rb
View File

@@ -56,6 +56,14 @@ module Post::ImageStore
CONFIG["url_base"] + path CONFIG["url_base"] + path
end end
def frame_url(filename, _frame_number)
"#{CONFIG["url_base"]}/data/frame/#{filename}"
end
def frame_preview_url(filename, _frame_number)
"#{CONFIG["url_base"]}/data/frame-preview/#{filename}"
end
def delete_file def delete_file
FileUtils.rm_f(file_path) FileUtils.rm_f(file_path)
FileUtils.rm_f(preview_path) if image? FileUtils.rm_f(preview_path) if image?

8
app/models/post/image_store/local_hierarchy.rb
View File

@@ -58,6 +58,14 @@ module Post::ImageStore
end end
end end
def frame_url(filename, _frame_number)
"#{CONFIG["url_base"]}/data/frame/#{filename}"
end
def frame_preview_url(filename, _frame_number)
"#{CONFIG["url_base"]}/data/frame-preview/#{filename}"
end
def delete_file def delete_file
FileUtils.rm_f(file_path) FileUtils.rm_f(file_path)
FileUtils.rm_f(preview_path) if image? FileUtils.rm_f(preview_path) if image?

10
app/models/post/image_store/remote_hierarchy.rb
View File

@@ -80,6 +80,16 @@ module Post::ImageStore
select_random_image_server + path select_random_image_server + path
end end
def frame_url(filename, frame_number)
frame_server = Mirrors.select_image_server(frames_warehoused, created_at.to_i + frame_number)
"#{frame_server}/data/frame/#{filename}"
end
def frame_preview_url(filename, frame_number)
frame_preview_server ||= Mirrors.select_image_server(frames_warehoused, created_at.to_i + frame_number, :use_aliases => true)
"#{frame_preview_server}/data/frame-preview/#{filename}"
end
def delete_file def delete_file
FileUtils.rm_f(file_path) FileUtils.rm_f(file_path)
FileUtils.rm_f(preview_path) if image? FileUtils.rm_f(preview_path) if image?