From caeeb437eee501004b1ebb3142f912461f4ee8d9 Mon Sep 17 00:00:00 2001 From: rouggy Date: Wed, 28 Aug 2024 13:14:10 +0700 Subject: [PATCH] u --- .vscode/launch.json | 15 +++++++++++++++ RaceBot.go | 3 ++- config/config.toml | 2 +- go.mod | 1 - go.sum | 2 -- internal/race/race.go | 14 -------------- models/race.go | 14 +++++++++++--- server/server.go | 17 ++++++++++++----- 8 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 .vscode/launch.json delete mode 100644 internal/race/race.go diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..647de67 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Package", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "RaceBot.go" + } + ] +} \ No newline at end of file diff --git a/RaceBot.go b/RaceBot.go index ebd5de1..89e8967 100644 --- a/RaceBot.go +++ b/RaceBot.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "log" "os" "path/filepath" @@ -44,5 +45,5 @@ func SQLiteMigrate() { if err := db.AutoMigrate(&models.Release{}, &models.Race{}).Error; err != nil { panic("[Database] Failed migrating database: ") } - fmt.Println("[Database] Database successfully migrated") + log.Println("[Database] Database successfully migrated") } diff --git a/config/config.toml b/config/config.toml index c959a6f..7bb6b1a 100644 --- a/config/config.toml +++ b/config/config.toml @@ -1,5 +1,5 @@ # config.toml -host = "127.0.0.1" +host = "0.0.0.0" port = "3000" # TMDbApiKey is required tmdbApiKey = "" diff --git a/go.mod b/go.mod index 8c54f94..3c551d7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.20 require ( github.com/gin-gonic/gin v1.9.0 github.com/jinzhu/gorm v1.9.16 - github.com/joho/godotenv v1.5.1 github.com/mattn/go-sqlite3 v1.14.16 github.com/moistari/rls v0.5.9 github.com/spf13/viper v1.15.0 diff --git a/go.sum b/go.sum index 0490c4c..d312fca 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,6 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= diff --git a/internal/race/race.go b/internal/race/race.go deleted file mode 100644 index cfc007f..0000000 --- a/internal/race/race.go +++ /dev/null @@ -1,14 +0,0 @@ -package race - -import "github.com/jinzhu/gorm" - -type Race struct { - gorm.Model - Hash string `gorm:"column:hash;type:varchar(50)" form:"hash" json:"hash" binding:"max=50"` - TorrentName string `gorm:"column:torrent_name;varchar(100);not null" form:"torrent_name" json:"torrent_name" binding:"required,max=100"` - Category string `gorm:"column:category;varchar(50);not null" form:"category" json:"category" binding:"max=50"` - ContentPath string `gorm:"column:content_path;varchar(100);not null" form:"content_path" json:"content_path" binding:"max=100"` - RootPath string `gorm:"column:root_path;varchar(100)" form:"root_path" json:"root_path" binding:"max=100"` - Size string `gorm:"column:size;varchar(15)" form:"size" json:"size" binding:"max=15"` - Won bool `gorm:"column:won;bool" form:"won" json:"won"` -} diff --git a/models/race.go b/models/race.go index 06bdacc..7a26910 100644 --- a/models/race.go +++ b/models/race.go @@ -10,10 +10,18 @@ type Race struct { Hash string `gorm:"column:hash;type:varchar(50)" form:"hash" json:"hash" binding:"max=50"` TorrentName string `gorm:"column:torrent_name;varchar(100);not null" form:"torrent_name" json:"torrent_name" binding:"required,max=100"` Category string `gorm:"column:category;varchar(50);not null" form:"category" json:"category" binding:"max=50"` - ContentPath string `gorm:"column:content_path;varchar(100);not null" form:"content_path" json:"content_path" binding:"max=100"` - RootPath string `gorm:"column:root_path;varchar(100)" form:"root_path" json:"root_path" binding:"max=100"` - Size string `gorm:"column:size;varchar(15)" form:"size" json:"size" binding:"max=15"` + Indexer string `gorm:"column:indexer;varchar(20);not null" form:"indexer" json:"indexer" binding:"max=20"` + Type string `gorm:"column:type;varchar(20)" form:"type" json:"type" binding:"max=20"` + Title string `gorm:"column:title;varchar(20)" form:"title" json:"title" binding:"max=20"` + Season string `gorm:"column:season;varchar(2)" form:"season" json:"season" binding:"max=2"` + Episode string `gorm:"column:episode;varchar(4)" form:"episode" json:"episode" binding:"max=4"` + Year string `gorm:"column:year;varchar(4)" form:"year" json:"year" binding:"max=4"` + Resolution string `gorm:"column:resolution;varchar(20)" form:"resolution" json:"resolution" binding:"max=20"` + Source string `gorm:"column:source;varchar(20)" form:"source" json:"source" binding:"max=20"` + HDR string `gorm:"column:hdr;varchar(20)" form:"hdr" json:"hdr" binding:"max=20"` + TorrentURL string `gorm:"column:torrenturl;varchar(20);not null" form:"torrenturl" json:"torrenturl" binding:"max=20"` Won bool `gorm:"column:won;bool" form:"won" json:"won"` + PreRace bool `gorm:"column:prerace;bool" form:"prerace" json:"prerace"` } func NewRace() *Race { diff --git a/server/server.go b/server/server.go index cba7eb5..82d75d3 100644 --- a/server/server.go +++ b/server/server.go @@ -1,10 +1,13 @@ package server import ( + "encoding/json" "fmt" + "log" "net" "git.rouggy.com/rouggy/RaceBot/internal/domain" + "git.rouggy.com/rouggy/RaceBot/models" ) type Server struct { @@ -24,7 +27,7 @@ func (s *Server) Start(cfg *domain.Config) { s.listener, _ = net.ListenTCP("tcp", tcpAddr) - fmt.Println("[Server] Server is running on port", cfg.Port) + log.Printf("[Server] Server is running on %v:%v", cfg.Host, cfg.Port) for { s.Conn, _ = s.listener.Accept() @@ -33,6 +36,13 @@ func (s *Server) Start(cfg *domain.Config) { } func (s *Server) handleRequest() { + + r := models.NewRace() + d := json.NewDecoder(s.Conn) + + err := d.Decode(&r) + log.Println(r, err) + //we make a buffer to hold the incoming data. buf := make([]byte, 1024) @@ -43,10 +53,7 @@ func (s *Server) handleRequest() { } // Print the message to the console. - fmt.Println("Received data:", string(buf[:reqLen])) - - // Write a response back to the client. - s.Conn.Write([]byte("Message received.")) + log.Println(string(buf[:reqLen])) // Close the connection when you're done with it. s.Conn.Close()