Skip to content

Upload big file differencies #647

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

Merged
milanmajchrak merged 6 commits into from
May 6, 2024
Merged

Upload big file differencies #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b88984
Update hint for big file upload
milanmajchrak Apr 30, 2024
e13cc0b
Do not delete big file after upload by default - changed cfg property.
milanmajchrak Apr 30, 2024
21e0c56
Refactored checking if the file should be deleted after upload.
milanmajchrak Apr 30, 2024
6617152
bigfile url removed from traditionalpageone form
milanmajchrak Apr 30, 2024
d2b46c0
Revert changes from traditionalpageone.
milanmajchrak Apr 30, 2024
602dba1
Remove big file metadata after every save metadata
milanmajchrak Apr 30, 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
7 changes: 5 additions & 2 deletions ...rver-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,12 @@ private void uploadFileFromURL(Context context, HttpServletRequest request, Inte

wis.update(context, witem);

// remove metadata from the item, because that file was uploading after every save
itemService.clearMetadata(context, witem.getItem(), "local", "bitstream", "redirectToURL", Item.ANY);

// delete file
String shouldDeleteFile = configurationService.getProperty("delete.big.file.after.upload");
if (StringUtils.isNotBlank(shouldDeleteFile) && StringUtils.equals("true", shouldDeleteFile)) {
boolean shouldDeleteFile = configurationService.getBooleanProperty("delete.big.file.after.upload", false);
if (shouldDeleteFile) {
FileUtils.forceDelete(file);
}
}
Expand Down
4 changes: 2 additions & 2 deletions dspace/config/clarin-dspace.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ lr.help.mail = test@test.sk
lr.help.phone = 0000

# Admin could upload the file bigger than maximum upload size.
# Should be this big file deleted from the '/temp' folder?
delete.big.file.after.upload = true
# Should be this big file deleted from where it was uploaded?
delete.big.file.after.upload = false


##### BITSTREAM DOWNLOAD #####
Expand Down
8 changes: 4 additions & 4 deletions dspace/config/submission-forms.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@
<label>Big file URL</label>
<input-type>onebox</input-type>
<hint>
The actual maximum upload size of the file is 4GB. To upload the file bigger than maximum
upload size type the URL of that big file. Admin must know URL to that bitstream file.
Then click on the 'Save' button and the file will start to upload. The file will be loaded
from the '/temp' folder of the server. Example: /tomcat/temp/bitstream.png
The actual maximum upload size of the file is 4GB. To upload a file bigger than the
maximum upload size, enter the URL of that large file. The admin must know the URL
of that bitstream file. Then, click on the 'Save' button, and the file will start
to upload. The file path must be an absolute path.
</hint>
<required></required>
<acl>
Expand Down