fix: error link while subfolder is empty (fix: AlistGo/alist#1356)

xhofe · xhofe · commit 3e2587658276 · 2022-07-21T22:07:38.000+08:00
diff --git a/src/hooks/useFolderLink.ts b/src/hooks/useFolderLink.ts
@@ -7,21 +7,24 @@ const useFolderLink = (proxy = false) => {
   let { pathname } = useLocation();
   let host = import.meta.env.VITE_SERVER_URL as string;
   if (host === "/") {
-    host = window.location.origin + "/";
+    host = window.location.origin;
   }
   let path = pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
   if (type === "file") {
     path = path.substring(0, path.lastIndexOf("/"));
   }
-  let subfolder = ""
+  let subfolder = "";
   if (window.ALIST.subfolder) {
     subfolder = window.ALIST.subfolder;
   }
   if (subfolder.endsWith("/")) {
     subfolder = subfolder.substring(0, subfolder.length - 1);
   }
-  if (subfolder.startsWith("/")) {
-    subfolder = subfolder.substring(1);
+  if (!subfolder.startsWith("/")) {
+    subfolder = "/" + subfolder;
+  }
+  if (subfolder === "/") {
+    subfolder = "";
   }
   if (proxy) {
     return `${host}${subfolder}/p${path}`;

Original file line number	Diff line number	Diff line change
`@@ -7,21 +7,24 @@ const useFolderLink = (proxy = false) => {`
`7`	`7`	`let { pathname } = useLocation();`
`8`	`8`	`let host = import.meta.env.VITE_SERVER_URL as string;`
`9`	`9`	`if (host === "/") {`
`10`		`- host = window.location.origin + "/";`
	`10`	`+ host = window.location.origin;`
`11`	`11`	`}`
`12`	`12`	`let path = pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;`
`13`	`13`	`if (type === "file") {`
`14`	`14`	`path = path.substring(0, path.lastIndexOf("/"));`
`15`	`15`	`}`
`16`		`- let subfolder = ""`
	`16`	`+ let subfolder = "";`
`17`	`17`	`if (window.ALIST.subfolder) {`
`18`	`18`	`subfolder = window.ALIST.subfolder;`
`19`	`19`	`}`
`20`	`20`	`if (subfolder.endsWith("/")) {`
`21`	`21`	`subfolder = subfolder.substring(0, subfolder.length - 1);`
`22`	`22`	`}`
`23`		`- if (subfolder.startsWith("/")) {`
`24`		`- subfolder = subfolder.substring(1);`
	`23`	`+ if (!subfolder.startsWith("/")) {`
	`24`	`+ subfolder = "/" + subfolder;`
	`25`	`+ }`
	`26`	`+ if (subfolder === "/") {`
	`27`	`+ subfolder = "";`
`25`	`28`	`}`
`26`	`29`	`if (proxy) {`
`27`	`30`	return `${host}${subfolder}/p${path}`;