github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: Merge pull request #961 from Xhofe/dev 

Dev v2.4.1
pull/999/head v2.4.1
Xhofe 2022-04-17 23:12:02 +08:00 committed by GitHub
parent 4e6a44253c d38f36ef44
commit 82a5c43b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alist_test.go
View File

@ -1,12 +0,0 @@
package main
import (
"fmt"
"net/url"
"testing"
)
func TestUrl(t *testing.T) {
s,_ := url.QueryUnescape("/ali/%E7%8C%AA%E5%A4%B4%E7%9A%84%E6%96%87%E4%BB%B6%5B%E5%98%BF%E5%98%BF%5D/%E9%82%B9%E9%82%B9%E7%9A%84%E6%96%87%E4%BB%B6/%E6%A1%8C%E9%9D%A2%E5%A3%81%E7%BA%B8/v2-e8f266ba17ae387eefed1cb22b2b5e4e_r.jpg")
fmt.Print(s)
}

16
build.sh
View File

@ -51,16 +51,8 @@ BUILD() {
gitTag=$(git describe --long --tags --dirty --always) gitTag=$(git describe --long --tags --dirty --always)
webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
echo "build version: $gitTag" echo "build version: $gitTag"
ldflags="\ ldflags="\
-w -s --extldflags '-static -fpic' \
-X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
-X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
-X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
-X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
-X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
"
ldflagsDarwin="\
-w -s \ -w -s \
-X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \ -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
-X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \ -X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
@ -70,11 +62,9 @@ BUILD() {
-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \ -X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
" "
if [ "$1" == "release" ]; then if [ "$1" == "release" ]; then
xgo -targets=linux/*,windows/* -out "$appName" -ldflags="$ldflags" -tags=jsoniter . xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
xgo -targets=darwin/* -out "$appName" -ldflags="$ldflagsDarwin" -tags=jsoniter .
else else
xgo -targets=linux/amd64,windows/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter . xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
xgo -targets=darwin/amd64 -out "$appName" -ldflags="$ldflagsDarwin" -tags=jsoniter .
fi fi
mkdir -p "build" mkdir -p "build"
mv alist-* build mv alist-* build

2
drivers/native/driver.go
View File

@ -103,7 +103,6 @@ func (driver Native) Files(path string, account *model.Account) ([]model.File, e
time := f.ModTime() time := f.ModTime()
file := model.File{ file := model.File{
Name: f.Name(), Name: f.Name(),
Size: f.Size(),
Type: 0, Type: 0,
UpdatedAt: &time, UpdatedAt: &time,
Driver: driver.Config().Name, Driver: driver.Config().Name,
@ -112,6 +111,7 @@ func (driver Native) Files(path string, account *model.Account) ([]model.File, e
file.Type = conf.FOLDER file.Type = conf.FOLDER
} else { } else {
file.Type = utils.GetFileType(filepath.Ext(f.Name())) file.Type = utils.GetFileType(filepath.Ext(f.Name()))
file.Size = f.Size()
} }
files = append(files, file) files = append(files, file)
} }