idk/i2p.plugins.tor-updater
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

move I2P launcher to own file

Browse Source
This commit is contained in:
idk
2022-03-19 18:55:51 -04:00
parent 26359e69b6
commit f1227409ae
2 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main.go
View File

@ -12,15 +12,12 @@ import (
"strings" "strings"
"github.com/cloudfoundry/jibber_jabber" "github.com/cloudfoundry/jibber_jabber"
i2cpcheck "github.com/eyedeekay/checki2cp"
"github.com/itchio/damage" "github.com/itchio/damage"
"github.com/itchio/damage/hdiutil" "github.com/itchio/damage/hdiutil"
"github.com/itchio/headway/state" "github.com/itchio/headway/state"
"github.com/ncruces/zenity" "github.com/ncruces/zenity"
tbget "i2pgit.org/idk/i2p.plugins.tor-manager/get" tbget "i2pgit.org/idk/i2p.plugins.tor-manager/get"
tbserve "i2pgit.org/idk/i2p.plugins.tor-manager/serve" tbserve "i2pgit.org/idk/i2p.plugins.tor-manager/serve"
"github.com/eyedeekay/go-I2P-jpackage"
) )
/* /*
@ -256,41 +253,8 @@ func main() {
} }
log.Println("Using auto-detected language", *lang) log.Println("Using auto-detected language", *lang)
} }
if tbget.TestHTTPDefaultProxy() { if err := StartI2P(*directory); err != nil {
log.Println("I2P HTTP proxy OK") log.Fatal(err)
} else {
log.Println("I2P HTTP proxy not OK")
run, err := i2cpcheck.ConditionallyLaunchI2P()
if err != nil {
log.Println("Couldn't launch I2P", err)
}
if run {
if tbget.TestHTTPDefaultProxy() {
log.Println("I2P HTTP proxy OK after launching I2P")
} else {
go proxy()
if !tbget.TestHTTPBackupProxy() {
log.Fatal("Please set the I2P HTTP proxy on localhost:4444", err)
}
}
} else {
I2Pdaemon, err := I2P.NewDaemon(*directory, false)
if err != nil {
log.Println(err)
return
}
if err = I2Pdaemon.Start(); err != nil {
log.Fatal(err)
}
shutdown = true
defer I2Pdaemon.Stop()
go runSysTray(true)
if tbget.TestHTTPDefaultProxy() {
log.Println("I2P HTTP proxy OK")
} else {
log.Fatal("Embedded i2pd unable to start")
}
}
} }
var err error var err error
client, err = tbserve.NewClient(*verbose, *lang, *system, *arch, *mirror, &content, *nounpack) client, err = tbserve.NewClient(*verbose, *lang, *system, *arch, *mirror, &content, *nounpack)

52
starti2p.go Normal file
View File

@ -0,0 +1,52 @@
package main
import (
"log"
i2cpcheck "github.com/eyedeekay/checki2cp"
"github.com/eyedeekay/go-I2P-jpackage"
tbget "i2pgit.org/idk/i2p.plugins.tor-manager/get"
)
func StartI2P(directory string) error {
if tbget.TestHTTPDefaultProxy() {
log.Println("I2P HTTP proxy OK")
} else {
log.Println("I2P HTTP proxy not OK")
run, err := i2cpcheck.ConditionallyLaunchI2P()
if err != nil {
log.Println("Couldn't launch I2P", err)
}
if run {
if tbget.TestHTTPDefaultProxy() {
log.Println("I2P HTTP proxy OK after launching I2P")
} else {
go proxy()
if !tbget.TestHTTPBackupProxy() {
log.Println("Please set the I2P HTTP proxy on localhost:4444", err)
return err
}
}
} else {
I2Pdaemon, err := I2P.NewDaemon(directory, false)
if err != nil {
log.Println(err)
return err
}
if err = I2Pdaemon.Start(); err != nil {
log.Println(err)
return err
}
shutdown = true
defer I2Pdaemon.Stop()
go runSysTray(true)
if tbget.TestHTTPDefaultProxy() {
log.Println("I2P HTTP proxy OK")
} else {
log.Println(err)
return err
}
}
}
return nil
}