Skip to content

Create directory when saving dataset-level files #6757

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
kcondon merged 1 commit into from
Mar 23, 2020
Merged

Create directory when saving dataset-level files #6757

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
23 changes: 19 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ public void open (DataAccessOption... options) throws IOException {
} else if (dvObject instanceof Dataset) {
//This case is for uploading a dataset related auxiliary file
//e.g. image thumbnails/metadata exports
//TODO: do we really need to do anything here? should we return the dataset directory?
dataset = this.getDataset();
if (isReadAccess) {
//TODO: Not necessary for dataset as there is no files associated with this
Expand Down Expand Up @@ -229,10 +228,19 @@ public void saveInputStream(InputStream inputStream) throws IOException {

@Override
public Channel openAuxChannel(String auxItemTag, DataAccessOption... options) throws IOException {

Path auxPath = getAuxObjectAsPath(auxItemTag);

if (isWriteAccessRequested(options)) {
if (dvObject instanceof Dataset && !this.canWrite()) {
// If this is a dataset-level auxilary file (a cached metadata export,
// dataset logo, etc.) there's a chance that no "real" files
// have been saved for this dataset yet, and thus the filesystem
// directory does not exist yet. Let's force a proper .open() on
// this StorageIO, that will ensure it is created:
open(DataAccessOption.WRITE_ACCESS);
}

FileOutputStream auxOut = new FileOutputStream(auxPath.toFile());

if (auxOut == null) {
Expand Down Expand Up @@ -287,7 +295,7 @@ public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
}

String datasetDirectory = getDatasetDirectory();

if (dvObject.getStorageIdentifier() == null || "".equals(dvObject.getStorageIdentifier())) {
throw new IOException("Data Access: No local storage identifier defined for this datafile.");
}
Expand Down Expand Up @@ -325,6 +333,10 @@ public void revertBackupAsAux(String auxItemTag) throws IOException {
// this method copies a local filesystem Path into this DataAccess Auxiliary location:
@Override
public void savePathAsAux(Path fileSystemPath, String auxItemTag) throws IOException {
if (dvObject instanceof Dataset && !this.canWrite()) {
// see the comment in openAuxChannel()
open(DataAccessOption.WRITE_ACCESS);
}
// quick Files.copy method:
try {
Path auxPath = getAuxObjectAsPath(auxItemTag);
Expand All @@ -340,7 +352,10 @@ public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Lon

@Override
public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException {

if (dvObject instanceof Dataset && !this.canWrite()) {
// see the comment in openAuxChannel()
open(DataAccessOption.WRITE_ACCESS);
}
// Since this is a local fileystem file, we can use the
// quick NIO Files.copy method:

Expand Down