apps/urtrator
Archived
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases 8 Wiki Activity

Little profile refactoring and favorite server adding fix.

Browse Source 
Done some refactoring on profiles handling. Too small, but deserve
these two lines in commit.

Fixed favorite server addition from scratch.
This commit is contained in:
Stanislav Nikitin 2017-05-13 01:08:56 +05:00
parent a6d53a3fd9
commit 070aa50762
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache/cache_profiles.go vendored
View File

@ -47,8 +47,8 @@ func (c *Cache) deleteProfile(data map[string]string) {
_, ok1 := c.Profiles[data["profile_name"]] _, ok1 := c.Profiles[data["profile_name"]]
c.ProfilesMutex.Unlock() c.ProfilesMutex.Unlock()
if !ok1 { if !ok1 {
fmt.Println("Profile deleted")
Database.Db.MustExec(Database.Db.Rebind("DELETE FROM urt_profiles WHERE name=?"), data["profile_name"]) Database.Db.MustExec(Database.Db.Rebind("DELETE FROM urt_profiles WHERE name=?"), data["profile_name"])
fmt.Println("Profile deleted")
} else { } else {
fmt.Println("Something goes wrong! Profile is still here!") fmt.Println("Something goes wrong! Profile is still here!")
} }

2
requester/pooler.go
View File

@ -36,7 +36,7 @@ type Pooler struct {
func (p *Pooler) Initialize() { func (p *Pooler) Initialize() {
fmt.Println("Initializing requester goroutine pooler...") fmt.Println("Initializing requester goroutine pooler...")
// ToDo: figure out how to make this work nice. // ToDo: figure out how to make this work nice.
p.maxrequests = 200 p.maxrequests = 150
_ = runtime.GOMAXPROCS(runtime.NumCPU() * 4) _ = runtime.GOMAXPROCS(runtime.NumCPU() * 4)
p.pp = "\377\377\377\377" p.pp = "\377\377\377\377"
fmt.Println("Pooler initialized") fmt.Println("Pooler initialized")

3
timer/timer.go
View File

@ -91,6 +91,7 @@ func (t *Timer) Initialize() {
fmt.Println("Initializing timer...") fmt.Println("Initializing timer...")
t.initializeStorage() t.initializeStorage()
Eventer.AddEventHandler("taskDone", t.SetTaskNotInProgress)
ticker := time.NewTicker(time.Second * 1) ticker := time.NewTicker(time.Second * 1)
go func() { go func() {
@ -98,8 +99,6 @@ func (t *Timer) Initialize() {
go t.executeTasks() go t.executeTasks()
} }
}() }()
Eventer.AddEventHandler("taskDone", t.SetTaskNotInProgress)
} }
func (t *Timer) initializeStorage() { func (t *Timer) initializeStorage() {

10
ui/gtk2/favorite.go
View File

@ -18,6 +18,7 @@ import (
"strings" "strings"
// Local // Local
"github.com/pztrn/urtrator/cachemodels"
"github.com/pztrn/urtrator/common" "github.com/pztrn/urtrator/common"
"github.com/pztrn/urtrator/datamodels" "github.com/pztrn/urtrator/datamodels"
@ -247,8 +248,17 @@ func (f *FavoriteDialog) saveFavorite() error {
} }
fmt.Println("Saving favorite server...") fmt.Println("Saving favorite server...")
fmt.Println(fmt.Sprintf("%+v", f.server))
key := strings.Split(f.server_address.GetText(), ":")[0] + ":" + port key := strings.Split(f.server_address.GetText(), ":")[0] + ":" + port
// Check if server already in cache. This would replace data about it.
_, ok := ctx.Cache.Servers[key]
if !ok {
ctx.Cache.Servers[key] = &cachemodels.Server{}
ctx.Cache.Servers[key].Server = &datamodels.Server{}
}
ctx.Cache.Servers[key].Server.Ip = f.server.Ip ctx.Cache.Servers[key].Server.Ip = f.server.Ip
ctx.Cache.Servers[key].Server.Port = f.server.Port ctx.Cache.Servers[key].Server.Port = f.server.Port
ctx.Cache.Servers[key].Server.Name = f.server.Name ctx.Cache.Servers[key].Server.Name = f.server.Name