opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#1900 tasks virtual fs (#2040)

Browse Source 
* dbeaver/pro#1900 Refactor DT and general UI

* dbeaver/pro#1900 Export to external FS implementation
This commit is contained in:
Serge Rider
2023-10-12 15:31:09 +03:00
committed by GitHub
parent bd9a18bc50
commit d0a820d27b
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
+8 -6
View File
@@ -246,12 +246,6 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
// Remove extension property (we specify file name directly)
properties.remove(StreamConsumerSettings.PROP_FILE_EXTENSION);
consumer.initTransfer(
dataContainer,
settings,
new IDataTransferConsumer.TransferParameters(processor.isBinaryFormat(), processor.isHTMLFormat()),
exporter,
properties);
DatabaseTransferProducer producer = new DatabaseTransferProducer(
dataContainer,
@@ -261,6 +255,14 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
producerSettings.setQueryRowCount(false);
producerSettings.setOpenNewConnections(CommonUtils.getOption(parameters.getDbProducerSettings(), "openNewConnection"));
consumer.initTransfer(
dataContainer,
settings,
new IDataTransferConsumer.TransferParameters(processor.isBinaryFormat(), processor.isHTMLFormat()),
exporter,
properties,
producer.getProject());
producer.transferData(monitor, consumer, null, producerSettings, null);
consumer.finishTransfer(monitor, false);
server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java
+9 -9
View File
@@ -53,7 +53,7 @@ public class WebServiceFS implements DBWServiceFS {
public FSFile getFile(@NotNull WebSession webSession, @NotNull String projectId, @NotNull URI fileUri)
throws DBWebException {
try {
Path filePath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fileUri);
Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileUri);
return new FSFile(filePath);
} catch (Exception e) {
throw new DBWebException("Failed to found file: " + e.getMessage(), e);
@@ -65,7 +65,7 @@ public class WebServiceFS implements DBWServiceFS {
public FSFile[] getFiles(@NotNull WebSession webSession, @NotNull String projectId, @NotNull URI folderURI)
throws DBWebException {
try {
Path folderPath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), folderURI);
Path folderPath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), folderURI);
try (var filesStream = Files.list(folderPath)) {
return filesStream.map(FSFile::new)
.toArray(FSFile[]::new);
@@ -80,7 +80,7 @@ public class WebServiceFS implements DBWServiceFS {
public String readFileContent(@NotNull WebSession webSession, @NotNull String projectId, @NotNull URI fileUri)
throws DBWebException {
try {
Path filePath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fileUri);
Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileUri);
return Files.readString(filePath);
} catch (Exception e) {
throw new DBWebException("Failed to read file content: " + e.getMessage(), e);
@@ -97,7 +97,7 @@ public class WebServiceFS implements DBWServiceFS {
)
throws DBWebException {
try {
Path filePath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fileURI);
Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileURI);
if (!forceOverwrite && Files.exists(filePath)) {
throw new DBException("Cannot overwrite exist file");
}
@@ -116,7 +116,7 @@ public class WebServiceFS implements DBWServiceFS {
@NotNull URI fileUri
) throws DBWebException {
try {
Path filePath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fileUri);
Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileUri);
Files.createFile(filePath);
return new FSFile(filePath);
} catch (Exception e) {
@@ -132,8 +132,8 @@ public class WebServiceFS implements DBWServiceFS {
@NotNull URI toURI
) throws DBWebException {
try {
Path from = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fromURI);
Path to = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), toURI);
Path from = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fromURI);
Path to = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), toURI);
Files.move(from, to);
return new FSFile(to);
} catch (Exception e) {
@@ -149,7 +149,7 @@ public class WebServiceFS implements DBWServiceFS {
@NotNull URI folderURI
) throws DBWebException {
try {
Path folderPath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), folderURI);
Path folderPath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), folderURI);
Files.createDirectory(folderPath);
return new FSFile(folderPath);
} catch (Exception e) {
@@ -164,7 +164,7 @@ public class WebServiceFS implements DBWServiceFS {
@NotNull URI fileUri
) throws DBWebException {
try {
Path filePath = webSession.getFileSystemManager(projectId).of(webSession.getProgressMonitor(), fileUri);
Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileUri);
Files.delete(filePath);
return true;
} catch (Exception e) {
server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class RMVirtualFileSystem implements DBFVirtualFileSystem {
}
@Override
public Path getPathByURI(DBRProgressMonitor monitor, URI uri) {
public Path getPathByURI(@NotNull DBRProgressMonitor monitor, @NotNull URI uri) {
return rmNioFileSystemProvider.getPath(uri);
}