Skip to content

feat: add grand preview size (and remove small ones) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
urs-van-binsbergen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add grand preview size (and remove small ones) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datalayer
Open in desktop
Submodule datalayer updated 19 files
+13 −7 app/models/media_file.rb
+12 −6 lib/madek/constants.rb
+ − spec/data/embed_test_files/thumbnails/1/16bb9f7f388e4b4eb4908f9d457718dc_grand.jpg
+ − spec/data/embed_test_files/thumbnails/6/6e86d8474b3143c698f7d53121d280ac_grand.jpg
+ − spec/data/embed_test_files/thumbnails/c/cb8c0a46f2744c3891ff5bd893581d21_0000_grand.jpg
+ − spec/data/embed_test_files/thumbnails/f/f7df90537cd547f2a82127229a52b452_grand.jpg
+ − spec/data/grumpy-cat_files/thumbnails/b/b8bf2eb322e04a29a52fbb06d4866af8_grand.jpg
+ − spec/data/images/grumpy_cat_620.jpg
+ − spec/data/images/sleepy_cat_1280.jpg
+ − spec/data/images/sleepy_cat_1600.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0000_grand.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0001_grand.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0002_grand.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0003_grand.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0004_grand.jpg
+ − spec/data/rv_files/thumbnails/8/8d9ad8d759094ed7a7dba75547b2c18d_0005_grand.jpg
+13 −19 spec/factories/embed_test_media_entries.rb
+6 −12 spec/factories/media_file.rb
+6 −12 spec/factories/research_video_entry.rb
2 changes: 1 addition & 1 deletion spec/resources/media-entry/edit_permissions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
edit_permissions: true
})
expect(user_perm.status).to eq 200
expect_audit_entries_count(1, 26, 1)
expect_audit_entries_count(1, 24, 1)
end

before(:each) { remove_all_audits }
Expand Down
5 changes: 2 additions & 3 deletions spec/resources/preview/preview_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
end

SHAS =
{small: "04d0162eee38b38e61ef406dfc2b897073ec4eb7f08772bec00b53ab17a4c824",
small_125: "b1c9ca6d87a005d07508bceb66ed056b499da6b39b79706c88a0addc38676291",
medium: "c3f6a3eae014d0fd1b09feb6031d21d5c342b6671d816009f30724dd666c8f65",
{medium: "c3f6a3eae014d0fd1b09feb6031d21d5c342b6671d816009f30724dd666c8f65",
large: "4adbe33f15234a0f8d669a2ee0a221a5a0b45bc9e3f9db55fd70984fa8f076a1",
x_large: "4adbe33f15234a0f8d669a2ee0a221a5a0b45bc9e3f9db55fd70984fa8f076a1",
grand: "66e1eb76ef8079968ff6a3e7519749be3fbb7b05d54a6f1270727273ccb2a539",
maximum: "4adbe33f15234a0f8d669a2ee0a221a5a0b45bc9e3f9db55fd70984fa8f076a1"}

describe "Getting a random preview for a specific media-entry" do
Expand Down
17 changes: 9 additions & 8 deletions src/madek/api/resources/previews.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
[req]
(let [media-file (-> req :media-file)
id (:id media-file)
size (or (-> req :parameters :query :size) "small")]
(if-let [preview (dbh/query-eq-find-one :previews :media_file_id id :thumbnail size (:tx req))]
requested-size (-> req :parameters :query :size)
size (or requested-size "medium")]
(if-let [preview (or (dbh/query-eq-find-one :previews :media_file_id id :thumbnail size (:tx req))
(when (nil? requested-size)
(dbh/query-eq-find-one :previews :media_file_id id :thumbnail "maximum" (:tx req))))]
(sd/response_ok preview)
(sd/response_not_found "No such preview file"))
;(info "handle_get-preview" "\nid\n" id "\nmf\n" media-file "\npreviews\n" preview)
))
(sd/response_not_found "No such preview file"))))
(defn add-preview-for-media-file [handler request]
(let [media-file (-> request :media-file)
id (:id media-file)
Expand All @@ -55,7 +56,7 @@
:media_file_id s/Uuid
:media_type s/Str
:content_type s/Str
;(s/enum "small" "small_125" "medium" "large" "x-large" "maximum")
;(s/enum "small" "small_125" "medium" "large" "x-large" "grand" "maximum")
:thumbnail s/Str
:width (s/maybe s/Int)
:height (s/maybe s/Int)
Expand All @@ -66,8 +67,8 @@

(def schema-image-size
{(s/optional-key :size)
^{:description "The size of the media entry. Allowed values: small, small_125, medium, large, x-large, maximum"}
(s/enum "small" "small_125" "medium" "large" "x-large" "maximum")})
^{:description "The size of the media entry. Allowed values: small, small_125, medium, large, x-large, grand, maximum"}
(s/enum "small" "small_125" "medium" "large" "x-large" "grand" "maximum")})

; TODO tests
(def preview-routes
Expand Down