Skip to content
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

Jump to bottom

files: add file management action and permission #853

Merged
merged 3 commits into from
May 17, 2024
Merged

files: add file management action and permission #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bf1248
files: add file management action and permission
alejandromumo May 10, 2024
9fd1fb2
docker: compact nginx config
slint May 16, 2024
7c69eb2
installation: bump dependencies
slint May 17, 2024
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 Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sphinx = ">=4.5"
isort = "<6.0" # Unpin when isort==6.0.0 is released

[packages]
invenio-app-rdm = {version = "~=12.0.0b3.dev14", extras = ["opensearch2"]}
invenio-app-rdm = {version = "~=12.0.0b3.dev15", extras = ["opensearch2"]}
invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
sentry-sdk = ">=1.45,<2.0.0"
zenodo_rdm = {editable="True", path="./site"}
Expand Down
240 changes: 120 additions & 120 deletions Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 5 additions & 17 deletions docker/nginx/conf.d/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,7 @@ server {
}

location ~ /api/iiif/record:(?<recid>.+):(?<filename>.+)/(?<end>info.json|(.+/)(.+/)(.+/)(.+\..+)) {
set $ch1 "";
set $ch2 "_";
set $ch3 "_";
set $ch4 "_";
set $ch1 ""; set $ch2 "_"; set $ch3 "_"; set $ch4 "_";
set $tail "";
set $endChar "_";

Expand All @@ -160,23 +157,14 @@ server {
# - 123456 -> 12/34/56_/
# - 1234567 -> 12/34/567_/
if ($recid ~ "(?<ch1>[a-zA-Z0-9\-])(?<ch2>[a-zA-Z0-9\-])?(?<ch3>[a-zA-Z0-9\-])?(?<ch4>[a-zA-Z0-9\-])?(?<tail>[a-zA-Z0-9\-]*)") {
set $ch1 $1;
set $ch2 $2;
set $ch3 $3;
set $ch4 $4;
set $ch1 $1; set $ch2 $2; set $ch3 $3; set $ch4 $4;
set $tail $5;
}

# Reset parts
if ($ch2 = "") {
set $ch2 "_";
}
if ($ch3 = "") {
set $ch3 "_";
}
if ($ch4 = "") {
set $ch4 "_";
}
if ($ch2 = "") { set $ch2 "_"; }
if ($ch3 = "") { set $ch3 "_"; }
if ($ch4 = "") { set $ch4 "_"; }

# Keep the original URI to pass to the fallback location in case of error
set $original_uri $request_uri;
Expand Down
12 changes: 12 additions & 0 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
invenio-app-rdm[opensearch2]~=12.0.0b3.dev14
invenio-logging[sentry_sdk]~=2.0
sentry-sdk>=1.45,<2.0.0
-e ./site
-e ./legacy
invenio-swh @ git+https://github.com/inveniosoftware/invenio-swh@v0.9.0
jsonschema>=4.17.0,<4.18.0
ipython!=8.1.0
uwsgi>=2.0
uwsgitop>=0.11
uwsgi-tools>=1.1.1
pyvips>=2.2.2,<3.0.0
Loading
Loading