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

ugoira: remove the PixivUgoiraFrameData model.

Browse Source 
Remove the last remaining uses of the PixivUgoiraFrameData model. As of
32bfb8407, Ugoira frame data is now stored in the MediaMetadata model,
under the `Ugoira:FrameDelays` EXIF field.

The pixiv_ugoira_frame_data table still exists, but it can be removed
after this commit is deployed.

Fixes #5264: Error when replacing with ugoira.
This commit is contained in:
evazion
2022-10-10 18:21:30 -05:00
parent a23c02d0cb
commit c2adf279ee
14 changed files with 31 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/factories/pixiv_ugoira_frame_data.rb
View File

@@ -1,12 +0,0 @@
FactoryBot.define do
factory(:pixiv_ugoira_frame_data) do
post
content_type { "image/jpeg" }
data do
[
{ "file" => "000000.jpg", "delay" => 200 },
{ "file" => "000001.jpg", "delay" => 200 },
]
end
end
end

11
test/functional/pixiv_ugoira_frame_data_controller_test.rb
View File

@@ -1,11 +0,0 @@
require "test_helper"
class PixivUgoiraFrameDataControllerTest < ActionDispatch::IntegrationTest
context "index action" do
should "work" do
create(:pixiv_ugoira_frame_data)
get pixiv_ugoira_frame_data_path, as: :json
assert_response :success
end
end
end

3
test/functional/post_replacements_controller_test.rb
View File

@@ -128,8 +128,7 @@ class PostReplacementsControllerTest < ActionDispatch::IntegrationTest
assert_equal("cad1da177ef309bf40a117c17b8eecf5", @post.media_asset.variant(:original).open_file.md5)
assert_equal("https://i.pximg.net/img-zip-ugoira/img/2017/04/04/08/57/38/62247364_ugoira1920x1080.zip", @post.source)
assert_equal([{"delay" => 125, "file" => "000000.jpg"}, {"delay" => 125, "file" => "000001.jpg"}], @post.pixiv_ugoira_frame_data.data)
assert_equal([125, 125], @post.media_asset.metadata["Ugoira:FrameDelays"])
assert_equal([125, 125], @post.media_asset.frame_delays)
end
end

3
test/unit/downloads/pixiv_test.rb
View File

@@ -122,8 +122,7 @@ module Downloads
@strategy = Source::Extractor.find("http://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247364")
media_file = @strategy.download_file!(@strategy.image_urls.sole)
assert_equal(2, media_file.frame_data.size)
assert_equal([{"file" => "000000.jpg", "delay" => 125}, {"file" => "000001.jpg", "delay" => 125}], media_file.frame_data)
assert_equal([125, 125], media_file.frame_delays)
end
end
end

12
test/unit/media_file_test.rb
View File

@@ -33,8 +33,8 @@ class MediaFileTest < ActiveSupport::TestCase
should "determine the correct dimensions for a ugoira file" do
skip unless MediaFile.videos_enabled?
frame_data = JSON.parse(File.read("test/files/ugoira.json"))
assert_equal([60, 60], MediaFile.open("test/files/ugoira.zip", frame_data: frame_data).dimensions)
frame_delays = JSON.parse(File.read("test/files/ugoira.json")).pluck("delay")
assert_equal([60, 60], MediaFile.open("test/files/ugoira.zip", frame_delays: frame_delays).dimensions)
end
should "determine the correct dimensions for a flash file" do
@@ -58,8 +58,8 @@ class MediaFileTest < ActiveSupport::TestCase
assert_equal([512, 512], mf.dimensions)
assert_equal([512, 512], mf.dimensions)
frame_data = JSON.parse(File.read("test/files/ugoira.json"))
mf = MediaFile.open("test/files/ugoira.zip", frame_data: frame_data)
frame_delays = JSON.parse(File.read("test/files/ugoira.json")).pluck("delay")
mf = MediaFile.open("test/files/ugoira.zip", frame_delays: frame_delays)
assert_equal([60, 60], mf.dimensions)
assert_equal([60, 60], mf.dimensions)
end
@@ -151,8 +151,8 @@ class MediaFileTest < ActiveSupport::TestCase
context "for a ugoira" do
setup do
skip unless MediaFile::Ugoira.videos_enabled?
frame_data = JSON.parse(File.read("test/files/ugoira.json"))
@ugoira = MediaFile.open("test/files/ugoira.zip", frame_data: frame_data)
frame_delays = JSON.parse(File.read("test/files/ugoira.json")).pluck("delay")
@ugoira = MediaFile.open("test/files/ugoira.zip", frame_delays: frame_delays)
end
should "generate a preview" do

3
test/unit/sources/pixiv_test.rb
View File

@@ -46,8 +46,7 @@ module Sources
should "capture the frame data" do
media_file = @site.download_file!(@site.image_urls.sole)
assert_equal(2, media_file.frame_data.size)
assert_equal([{"file" => "000000.jpg", "delay" => 125}, {"file" => "000001.jpg", "delay" => 125}], media_file.frame_data)
assert_equal([125, 125], media_file.frame_delays)
end
end