sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 13:36:09 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
yourok
2019-09-20 13:21:03 +03:00
parent 478c991dfd
commit 72e8bf891f
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build-all.sh
View File

@@ -120,32 +120,32 @@ export GOOS=android
export LDFLAGS="-s -w" export LDFLAGS="-s -w"
export NDK_TOOLCHAIN=/space/Projects/GO/TorrServer/toolchains export NDK_TOOLCHAIN=/space/Projects/GO/TorrServer/toolchains
export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang
export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang++ export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang++
export GOARCH=arm export GOARCH=arm
export GOARM=7 export GOARM=7
BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
echo "Android ${BIN_FILENAME}" echo "Android ${BIN_FILENAME}"
go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
export CC=$NDK_TOOLCHAIN/bin/aarch64-linux-android28-clang export CC=$NDK_TOOLCHAIN/bin/aarch64-linux-android21-clang
export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android28-clang++ export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android21-clang++
export GOARCH=arm64 export GOARCH=arm64
export GOARM="" export GOARM=""
BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
echo "Android ${BIN_FILENAME}" echo "Android ${BIN_FILENAME}"
go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
export CC=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang export CC=$NDK_TOOLCHAIN/bin/i686-linux-android21-clang
export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang++ export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android21-clang++
export GOARCH=386 export GOARCH=386
export GOARM="" export GOARM=""
BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
echo "Android ${BIN_FILENAME}" echo "Android ${BIN_FILENAME}"
go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
export CC=$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-android28-clang++ export CXX=$NDK_TOOLCHAIN/bin/x86_64-linux-android21-clang++
export GOARCH=amd64 export GOARCH=amd64
export GOARM="" export GOARM=""
BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"

9
src/server/web/helpers/Torrent.go
View File

@@ -25,14 +25,15 @@ func Add(bts *torr.BTServer, magnet metainfo.Magnet, save bool) error {
torDb.Size = torr.Length() torDb.Size = torr.Length()
torDb.Magnet = magnet.String() torDb.Magnet = magnet.String()
torDb.Timestamp = time.Now().Unix() torDb.Timestamp = time.Now().Unix()
files := torr.Files() files := torr.Stats().FileStats
sort.Slice(files, func(i, j int) bool { 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 { for _, f := range files {
ff := settings.File{ ff := settings.File{
Name: f.Path(), Id: f.Id,
Size: f.Length(), Name: f.Path,
Size: f.Length,
} }
torDb.Files = append(torDb.Files, ff) torDb.Files = append(torDb.Files, ff)
} }