mirror of
https://github.com/Ernous/TorrServerJellyfin.git
synced 2025-12-19 13:36:09 +05:00
update
This commit is contained in:
@@ -3,8 +3,11 @@ package main
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/alexflint/go-arg"
|
||||
@@ -13,17 +16,21 @@ import (
|
||||
"server"
|
||||
"server/log"
|
||||
"server/settings"
|
||||
"server/torr"
|
||||
"server/version"
|
||||
"server/web/api/utils"
|
||||
)
|
||||
|
||||
type args struct {
|
||||
Port string `arg:"-p" help:"web server port"`
|
||||
Path string `arg:"-d" help:"database path"`
|
||||
LogPath string `arg:"-l" help:"log path"`
|
||||
RDB bool `arg:"-r" help:"start in read-only DB mode"`
|
||||
HttpAuth bool `arg:"-a" help:"http auth on all requests"`
|
||||
DontKill bool `arg:"-k" help:"dont kill server on signal"`
|
||||
UI bool `arg:"-u" help:"run page torrserver in browser"`
|
||||
Port string `arg:"-p" help:"web server port"`
|
||||
Path string `arg:"-d" help:"database path"`
|
||||
LogPath string `arg:"-l" help:"log path"`
|
||||
WebLogPath string `arg:"-w" help:"web log path"`
|
||||
RDB bool `arg:"-r" help:"start in read-only DB mode"`
|
||||
HttpAuth bool `arg:"-a" help:"http auth on all requests"`
|
||||
DontKill bool `arg:"-k" help:"dont kill server on signal"`
|
||||
UI bool `arg:"-u" help:"run page torrserver in browser"`
|
||||
TorrentsDir string `arg:"-t" help:"autoload torrent from dir"`
|
||||
}
|
||||
|
||||
func (args) Version() string {
|
||||
@@ -45,7 +52,7 @@ func main() {
|
||||
|
||||
settings.Path = params.Path
|
||||
settings.HttpAuth = params.HttpAuth
|
||||
log.Init(params.LogPath)
|
||||
log.Init(params.LogPath, params.WebLogPath)
|
||||
|
||||
dnsResolve()
|
||||
Preconfig(params.DontKill)
|
||||
@@ -57,8 +64,13 @@ func main() {
|
||||
}()
|
||||
}
|
||||
|
||||
if params.TorrentsDir != "" {
|
||||
go watchTDir(params.TorrentsDir)
|
||||
}
|
||||
|
||||
server.Start(params.Port, params.RDB)
|
||||
log.TLogln(server.WaitServer())
|
||||
log.Close()
|
||||
time.Sleep(time.Second * 3)
|
||||
os.Exit(0)
|
||||
}
|
||||
@@ -81,3 +93,37 @@ func dnsResolve() {
|
||||
fmt.Println("Check new dns", addrs, err)
|
||||
}
|
||||
}
|
||||
|
||||
func watchTDir(dir string) {
|
||||
time.Sleep(5 * time.Second)
|
||||
path, err := filepath.Abs(dir)
|
||||
if err != nil {
|
||||
path = dir
|
||||
}
|
||||
for {
|
||||
files, err := ioutil.ReadDir(path)
|
||||
if err == nil {
|
||||
for _, file := range files {
|
||||
filename := filepath.Join(path, file.Name())
|
||||
if strings.ToLower(filepath.Ext(file.Name())) == ".torrent" {
|
||||
sp, err := utils.ParseLink("file://" + filename)
|
||||
if err == nil {
|
||||
tor, err := torr.AddTorrent(sp, "", "", "")
|
||||
if err == nil {
|
||||
if tor.GotInfo() {
|
||||
if tor.Title == "" {
|
||||
tor.Title = tor.Name()
|
||||
}
|
||||
torr.SaveTorrentToDB(tor)
|
||||
tor.Drop()
|
||||
os.Remove(filename)
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ func Preconfig(dkill bool) {
|
||||
signal.Notify(sigc,
|
||||
syscall.SIGHUP,
|
||||
syscall.SIGINT,
|
||||
syscall.SIGSTOP,
|
||||
|
||||
syscall.SIGPIPE,
|
||||
syscall.SIGTERM,
|
||||
syscall.SIGQUIT)
|
||||
|
||||
@@ -1,136 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/alexflint/go-arg"
|
||||
"github.com/pkg/browser"
|
||||
|
||||
"server"
|
||||
"server/log"
|
||||
"server/settings"
|
||||
"server/torr"
|
||||
utils2 "server/utils"
|
||||
"server/version"
|
||||
"server/web/api/utils"
|
||||
)
|
||||
|
||||
type args struct {
|
||||
Port string `arg:"-p" help:"web server port"`
|
||||
Path string `arg:"-d" help:"database path"`
|
||||
LogPath string `arg:"-l" help:"log path"`
|
||||
RDB bool `arg:"-r" help:"start in read-only DB mode"`
|
||||
HttpAuth bool `arg:"-a" help:"http auth on all requests"`
|
||||
DontKill bool `arg:"-k" help:"dont kill server on signal"`
|
||||
UI bool `arg:"-u" help:"run page torrserver in browser"`
|
||||
}
|
||||
|
||||
func (args) Version() string {
|
||||
return "TorrServer " + version.Version
|
||||
}
|
||||
|
||||
var params args
|
||||
|
||||
func main() {
|
||||
arg.MustParse(¶ms)
|
||||
|
||||
if params.Path == "" {
|
||||
params.Path, _ = os.Getwd()
|
||||
}
|
||||
|
||||
if params.Port == "" {
|
||||
params.Port = "8090"
|
||||
}
|
||||
|
||||
settings.Path = params.Path
|
||||
settings.HttpAuth = params.HttpAuth
|
||||
log.Init(params.LogPath)
|
||||
|
||||
dnsResolve()
|
||||
|
||||
if params.UI {
|
||||
go func() {
|
||||
time.Sleep(time.Second)
|
||||
browser.OpenURL("http://127.0.0.1:" + params.Port)
|
||||
}()
|
||||
}
|
||||
|
||||
go testLoad()
|
||||
server.Start(params.Port, params.RDB)
|
||||
log.TLogln(server.WaitServer())
|
||||
time.Sleep(time.Second * 3)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
func dnsResolve() {
|
||||
addrs, err := net.LookupHost("www.google.com")
|
||||
if len(addrs) == 0 {
|
||||
fmt.Println("Check dns", addrs, err)
|
||||
|
||||
fn := func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
d := net.Dialer{}
|
||||
return d.DialContext(ctx, "udp", "1.1.1.1:53")
|
||||
}
|
||||
|
||||
net.DefaultResolver = &net.Resolver{
|
||||
Dial: fn,
|
||||
}
|
||||
|
||||
addrs, err = net.LookupHost("www.themoviedb.org")
|
||||
fmt.Println("Check new dns", addrs, err)
|
||||
}
|
||||
}
|
||||
|
||||
func testLoad() {
|
||||
time.Sleep(time.Second * 5)
|
||||
spec, err := utils.ParseLink("magnet:?xt=urn:btih:41951b387b5e42cb72be44df14040c5d138770bb")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
|
||||
tor, err := torr.AddTorrent(spec, "Test", "", "")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
|
||||
tor.GotInfo()
|
||||
files := tor.Files()
|
||||
if len(files) == 0 {
|
||||
fmt.Println("Files is empty")
|
||||
return
|
||||
}
|
||||
|
||||
torr.Preload(tor, 0)
|
||||
|
||||
buf := make([]byte, 32*1024, 32*1024)
|
||||
offset := 0
|
||||
readed := 0
|
||||
|
||||
lastTime := time.Now()
|
||||
fmt.Println("Read file...")
|
||||
reader := tor.NewReader(files[0])
|
||||
for {
|
||||
n, err := reader.Read(buf)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
break
|
||||
}
|
||||
offset += n
|
||||
readed += n
|
||||
since := time.Since(lastTime)
|
||||
if since > time.Second {
|
||||
readStr := utils2.Format(float64(readed) / since.Seconds())
|
||||
loadStr := utils2.Format(tor.Status().DownloadSpeed)
|
||||
fmt.Println("RS:", readStr+"/sec", "DS:", loadStr+"/sec")
|
||||
readed = 0
|
||||
lastTime = time.Now()
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user