Skip to content

Commit

Permalink
Merge pull request #3944 from nulib/deploy/staging
Browse files Browse the repository at this point in the history
Deploy v9.3.4 to production
  • Loading branch information
kdid authored May 3, 2024
2 parents 09c0203 + 9886a60 commit 429a0a6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
15 changes: 6 additions & 9 deletions app/lib/meadow/data/file_sets.ex
Original file line number Diff line number Diff line change
Expand Up @@ -214,23 +214,20 @@ defmodule Meadow.Data.FileSets do
end

def derivative_key(file_set) do
Path.join([
"derivatives",
Pairtree.derivative_path(file_set.id)
])
Path.join([
"derivatives",
Pairtree.derivative_path(file_set.id)
])
end

def download_uri_for(%FileSet{id: id, role: %{id: "X"}}), do: download_uri(id)
def download_uri_for(%FileSet{id: id, role: %{id: "A"}}), do: download_uri(id)
def download_uri_for(_), do: nil

defp download_uri(id) do
with uri <- URI.parse(Application.get_env(:meadow, :dc_api) |> get_in([:v2, "base_url"])) do
uri
|> URI.merge("file-sets/" <> id <> "/download")
|> URI.to_string()
api_url = Application.get_env(:meadow, :dc_api) |> get_in([:v2, "base_url"])
"#{api_url}/file-sets/#{id}/download"
end
end

defp multi_update(file_set_updates) do
file_set_updates
Expand Down
2 changes: 1 addition & 1 deletion app/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Code.require_file("lib/env.ex")
defmodule Meadow.MixProject do
use Mix.Project

@app_version "9.3.3"
@app_version "9.3.4"

def project do
[
Expand Down

0 comments on commit 429a0a6

Please sign in to comment.