diff --git a/build-all.sh b/build-all.sh index 976f012..1ac9b9a 100755 --- a/build-all.sh +++ b/build-all.sh @@ -120,32 +120,32 @@ export GOOS=android export LDFLAGS="-s -w" export NDK_TOOLCHAIN=/space/Projects/GO/TorrServer/toolchains -export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang -export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang++ +export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang +export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang++ export GOARCH=arm export GOARM=7 BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" echo "Android ${BIN_FILENAME}" go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main -export CC=$NDK_TOOLCHAIN/bin/aarch64-linux-android28-clang -export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android28-clang++ +export CC=$NDK_TOOLCHAIN/bin/aarch64-linux-android21-clang +export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android21-clang++ export GOARCH=arm64 export GOARM="" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" echo "Android ${BIN_FILENAME}" go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main -export CC=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang -export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang++ +export CC=$NDK_TOOLCHAIN/bin/i686-linux-android21-clang +export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android21-clang++ export GOARCH=386 export GOARM="" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" echo "Android ${BIN_FILENAME}" go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main -export CC=$NDK_TOOLCHAIN/bin/x86_64-linux-android28-clang -export CXX=$NDK_TOOLCHAIN/bin/x86_64-linux-android28-clang++ +export CC=$NDK_TOOLCHAIN/bin/x86_64-linux-android21-clang +export CXX=$NDK_TOOLCHAIN/bin/x86_64-linux-android21-clang++ export GOARCH=amd64 export GOARM="" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" diff --git a/src/server/web/helpers/Torrent.go b/src/server/web/helpers/Torrent.go index a77acf0..5b04b0c 100644 --- a/src/server/web/helpers/Torrent.go +++ b/src/server/web/helpers/Torrent.go @@ -25,14 +25,15 @@ func Add(bts *torr.BTServer, magnet metainfo.Magnet, save bool) error { torDb.Size = torr.Length() torDb.Magnet = magnet.String() torDb.Timestamp = time.Now().Unix() - files := torr.Files() + files := torr.Stats().FileStats sort.Slice(files, func(i, j int) bool { - return files[i].Path() < files[j].Path() + return files[i].Path < files[j].Path }) for _, f := range files { ff := settings.File{ - Name: f.Path(), - Size: f.Length(), + Id: f.Id, + Name: f.Path, + Size: f.Length, } torDb.Files = append(torDb.Files, ff) }