zhao/luci-app-alist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alist: bump to v3.0.0-beta.1

Browse Source
This commit is contained in:
sbwml 2022-09-10 17:43:20 +08:00
parent d927bedd76
commit 6cfba794ab
3 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alist/Makefile
View File

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alist
PKG_VERSION:=3.0.0-beta.0
PKG_VERSION:=3.0.0-beta.1
PKG_WEB_VERSION:=3.0.0-beta.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=971f69bbc4fe550d4dc7f10a40290d48f8a019878ea4719da473b68297571804
PKG_HASH:=ee23dae35de550c4c829d869d76b777a5138bcf8de003853dd3f5344bcf6f381
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE

33
alist/patches/001-fix-error-if-use-abs-temp-path.patch
View File

@ -1,33 +0,0 @@
From 4af91241627909fcf34cc6e4f7abd32a2781f321 Mon Sep 17 00:00:00 2001
From: Noah Hsu <i@nn.ci>
Date: Fri, 9 Sep 2022 18:50:54 +0800
Subject: [PATCH] fix: error if use abs temp path (close #1624)
---
internal/bootstrap/config.go | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/internal/bootstrap/config.go b/internal/bootstrap/config.go
index ad9f64926..3e72a98fd 100644
--- a/internal/bootstrap/config.go
+++ b/internal/bootstrap/config.go
@@ -48,16 +48,14 @@ func InitConfig() {
confFromEnv()
}
// convert abs path
- var absPath string
- var err error
if !filepath.IsAbs(conf.Conf.TempDir) {
- absPath, err = filepath.Abs(conf.Conf.TempDir)
+ absPath, err := filepath.Abs(conf.Conf.TempDir)
if err != nil {
log.Fatalf("get abs path error: %+v", err)
}
+ conf.Conf.TempDir = absPath
}
- conf.Conf.TempDir = absPath
- err = os.RemoveAll(filepath.Join(conf.Conf.TempDir))
+ err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
if err != nil {
log.Errorln("failed delete temp file:", err)
}

31
alist/patches/002-fix-if-use-down-proxy-url.patch
View File

@ -1,31 +0,0 @@
From 5ad3849bb635b6f339c4d1d5f648882e840c9189 Mon Sep 17 00:00:00 2001
From: Noah Hsu <i@nn.ci>
Date: Fri, 9 Sep 2022 20:54:11 +0800
Subject: [PATCH] fix: if use down proxy url
---
server/handles/down.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/handles/down.go b/server/handles/down.go
index eb9d04a47..bbe0a30b3 100644
--- a/server/handles/down.go
+++ b/server/handles/down.go
@@ -52,7 +52,7 @@ func Proxy(c *gin.Context) {
downProxyUrl := storage.GetStorage().DownProxyUrl
if downProxyUrl != "" {
_, ok := c.GetQuery("d")
- if ok {
+ if !ok {
URL := fmt.Sprintf("%s%s?sign=%s",
strings.Split(downProxyUrl, "\n")[0],
utils.EncodePath(rawPath, true),
@@ -103,7 +103,7 @@ func shouldProxy(storage driver.Driver, filename string) bool {
// 4. proxy_types
// solution: text_file + shouldProxy()
func canProxy(storage driver.Driver, filename string) bool {
- if storage.Config().MustProxy() || storage.GetStorage().WebProxy {
+ if storage.Config().MustProxy() || storage.GetStorage().WebProxy || storage.GetStorage().WebdavProxy() {
return true
}
if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {