make compatible the vfs on https and github, pulicating the repositories

barrelorgandiscovery · Oct 15, 2023 · 4c6eeed · 4c6eeed
1 parent 32aa48c
commit 4c6eeed
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 21 deletions.
diff --git a/aprint-core/src/main/java/org/barrelorgandiscovery/tools/VFSTools.java b/aprint-core/src/main/java/org/barrelorgandiscovery/tools/VFSTools.java
@@ -34,6 +34,7 @@ public static StandardFileSystemManager getManager() throws Exception {
 		fsManager.init();
 
 		fsManager.addProvider("bod", new BodProvider());
+		fsManager.addProvider("bods", new BodProvider());
 
 		FSMANAGER = fsManager;
 		VFS.setManager(FSMANAGER);

diff --git a/aprint-core/src/main/java/org/barrelorgandiscovery/vfs2/provider/BodFileObject.java b/aprint-core/src/main/java/org/barrelorgandiscovery/vfs2/provider/BodFileObject.java
@@ -69,6 +69,18 @@ ResponseInformations toResponseInformation(HttpResponse response) {
 		return responseInformations;
 	}
 
+	@Override
+	public boolean exists() throws FileSystemException {
+		boolean exists = (getType() != FileType.IMAGINARY);
+		return exists;
+	}
+
+	@Override
+	public FileType getType() throws FileSystemException {
+		FileType type = super.getType();
+		return type;
+	}
+
 	/**
 	 * Construct {@code Http4FileObject}.
 	 *
@@ -153,7 +165,13 @@ protected RandomAccessContent doGetRandomAccessContent(final RandomAccessMode mo
 	}
 
 	URI getHttpUri() {
-		return URI.create(getInternalURI().toString().replaceAll("bod://", "http://"));
+		String uri = getInternalURI().toString();
+
+		uri = uri.replaceAll("bod://", "http://");
+		if (uri.contains(":443")) {
+			uri = uri.replaceAll("http://", "https://");
+		}
+		return URI.create(uri);
 	}
 
 	FileType fileType = null;
@@ -174,12 +192,33 @@ protected FileType doGetType() throws Exception {
 			lastHeadResponse = toResponseInformation(httpResponse);
 			final int status = httpResponse.getStatusLine().getStatusCode();
 
+			// try get content
+
 			if (status == HttpStatus.SC_OK
 					|| status == HttpStatus.SC_METHOD_NOT_ALLOWED /* method is not allowed, but resource exist */) {
 				fileType = FileType.FILE;
 				return fileType;
 			}
 
+			if (status == HttpStatus.SC_NOT_FOUND) {
+				// try /content
+				URI contentListUri = URI.create(getHttpUri() + "/CONTENT");
+
+				final HttpGet getRequest = new HttpGet(contentListUri);
+				try (final CloseableHttpResponse httpResponseContent = executeHttpUriRequest(getRequest)) {
+					try {
+						final int content_status = httpResponseContent.getStatusLine().getStatusCode();
+						if (content_status == HttpStatus.SC_OK) {
+							getChildren();
+							fileType = FileType.FOLDER;
+							return fileType;
+						}
+					} catch (Exception ex) {
+						// continue
+					}
+				}
+			}
+
 			if (status == HttpStatus.SC_NOT_FOUND || status == HttpStatus.SC_GONE) {
 				fileType = FileType.IMAGINARY;
 				return fileType;
@@ -255,7 +294,7 @@ protected CloseableHttpResponse executeHttpUriRequest(final HttpUriRequest httpR
 		// System.out.println("execute : " + httpRequest);
 		final HttpClientContext httpClientContext = getAbstractFileSystem().getHttpClientContext();
 		CloseableHttpResponse response = (CloseableHttpResponse) httpClient.execute(httpRequest, httpClientContext);
-		// System.out.println("  response :" + response.getStatusLine());
+		// System.out.println(" response :" + response.getStatusLine());
 		return response;
 
 	}

diff --git a/aprint-core/src/main/resources/aprintversion.properties b/aprint-core/src/main/resources/aprintversion.properties
@@ -1,5 +1,5 @@
 #APrint Version
-#Fri Aug 18 17:30:52 CEST 2023
-date=2023/08/18 05\:30
-githash=e6865a76e605c2f15ff44241da8c932c55173093
-version=2022.12.955
+#Fri Aug 18 17:53:17 CEST 2023
+date=2023/08/18 05\:53
+githash=03f833ac65e05257e0c5ac51333a92ffb873ae2b
+version=2022.12.956
diff --git a/aprint-gui/src/main/java/org/barrelorgandiscovery/gui/tools/BookmarkPanel.java b/aprint-gui/src/main/java/org/barrelorgandiscovery/gui/tools/BookmarkPanel.java
@@ -23,6 +23,7 @@
 
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.VFS;
+import org.barrelorgandiscovery.tools.VFSTools;
 import org.jdesktop.swingx.HorizontalLayout;
 
 import com.googlecode.vfsjfilechooser2.VFSJFileChooser;
@@ -195,22 +196,12 @@ public void run() {
 
 					FileObject fo = null;
 					String failureMessage = null;
-					try {
-//						if(aTitledURLEntry.getURL().startsWith("ftp")) {
-//							 FileSystemOptions opts = new FileSystemOptions();
-//
-//						        FtpFileSystemConfigBuilder.getInstance().setPassiveMode(opts, true);
-//						        FileSystemManager manager = VFS.getManager();
-//fo = manager.resolveFile(aTitledURLEntry.getURL(), opts);
-//						} else {
-//							
-
-						fo = VFS.getManager().resolveFile(aTitledURLEntry.getURL());
-						//}
-
-						if ((fo != null) && !fo.exists()) {
+					try {						
+						fo = VFSTools.getManager().resolveFile(aTitledURLEntry.getURL());
+						//FileObject[] childrens = fo.getChildren();
+						/* if ((fo != null) && !fo.exists()) {
 							fo = null;
-						}
+						}*/
 					} catch (Throwable exc) {
 						fo = null;
 						failureMessage = exc.getMessage();