Skip to content

[ZEPPELIN-4574] Fixed rootNotebookFolder and noteFileName in VFSNotebookRepo.java to allow it to work on windows #3615

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

Closed
Muhammad-ms wants to merge 3 commits into from
Closed

[ZEPPELIN-4574] Fixed rootNotebookFolder and noteFileName in VFSNotebookRepo.java to allow it to work on windows #3615

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f532aa
Merge pull request #1 from apache/master
Muhammad-ms Jan 20, 2020
81b054e
[ZEPPELIN-4574] Fixed rootNotebookFolder and noteFileName in VFSNoteb…
Muhammad-ms Jan 20, 2020
b0a65c0
[ZEPPELIN-4574] Added comments explaining the change
Muhammad-ms Jan 21, 2020
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
8 changes: 6 additions & 2 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ protected void setNotebookDirectory(String notebookDirPath) throws IOException {
LOGGER.info("Notebook dir doesn't exist: {}, creating it.",
rootNotebookFileObject.getName().getPath());
}
this.rootNotebookFolder = rootNotebookFileObject.getName().getPath();
// getPath() method returns a string without root directory in windows, so we use getURI() instead
// windows does not support paths with "file:///" prepended, so we replace it by "/"
this.rootNotebookFolder = rootNotebookFileObject.getName().getURI().replace("file:///", "/");
Copy link
Contributor

@zjffdu zjffdu Jan 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind to add some comment on this change to help others understand why call getURI().replace("file:///", "/")?

Copy link
Contributor Author

@Muhammad-ms Muhammad-ms Jan 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor

@zjffdu zjffdu Jan 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Muhammad-ms LGTM

}

@Override
Expand All @@ -110,7 +112,9 @@ private Map<String, NoteInfo> listFolder(FileObject fileObject) throws IOExcepti
noteInfos.putAll(listFolder(child));
}
} else {
String noteFileName = fileObject.getName().getPath();
// getPath() method returns a string without root directory in windows, so we use getURI() instead
// windows does not support paths with "file:///" prepended. so we replace it by "/"
String noteFileName = fileObject.getName().getURI().replace("file:///", "/");
if (noteFileName.endsWith(".zpln")) {
try {
String noteId = getNoteId(noteFileName);
Expand Down