mirror of
https://github.com/clockworkpi/LauncherGoDev.git
synced 2025-12-12 16:08:52 +01:00
clean incorrect Fatal
This commit is contained in:
parent
06f7589f8b
commit
c813de432d
@ -667,7 +667,7 @@ func (self *BluetoothPage) GenNetworkList() {
|
|||||||
|
|
||||||
props, err := v.GetProperties()
|
props, err := v.GetProperties()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("%s: Failed to get properties: %s", v.Path, err.Error())
|
log.Printf("%s: Failed to get properties: %s\n", v.Path, err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -538,25 +538,27 @@ func (self *WifiList) SaveWifiPassword(essid,password string) {
|
|||||||
|
|
||||||
stmt, err := db.Prepare("select count(*) from wifi where essid = ?")
|
stmt, err := db.Prepare("select count(*) from wifi where essid = ?")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
defer stmt.Close()
|
defer stmt.Close()
|
||||||
var count string
|
var count string
|
||||||
err = stmt.QueryRow(essid).Scan(&count)
|
err = stmt.QueryRow(essid).Scan(&count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
|
count = "0"
|
||||||
}
|
}
|
||||||
|
|
||||||
cnt,_ := strconv.Atoi(count)
|
cnt,_ := strconv.Atoi(count)
|
||||||
if cnt > 0 {
|
if cnt > 0 {
|
||||||
_,err = db.Exec("update wifi set pass= :pass where essid = :essid",sql.Named("pass",password),sql.Named("essid",essid))
|
_,err = db.Exec("update wifi set pass= :pass where essid = :essid",sql.Named("pass",password),sql.Named("essid",essid))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
_,err = db.Exec("insert into wifi(essid,pass) values(:essid,:pass)",sql.Named("essid",essid),sql.Named("pass",password))
|
_,err = db.Exec("insert into wifi(essid,pass) values(:essid,:pass)",sql.Named("essid",essid),sql.Named("pass",password))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -569,20 +571,18 @@ func (self *WifiList) LoadWifiPassword(essid string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
defer db.Close()
|
defer db.Close()
|
||||||
|
|
||||||
stmt, err := db.Prepare("select pass from wifi where essid = ?")
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
defer stmt.Close()
|
|
||||||
|
|
||||||
password := ""
|
|
||||||
|
|
||||||
err = stmt.QueryRow(essid).Scan(&password)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
password := ""
|
||||||
|
stmt, err := db.Prepare("select pass from wifi where essid = ?")
|
||||||
|
defer stmt.Close()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}else {
|
||||||
|
err = stmt.QueryRow(essid).Scan(&password)
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
return password
|
return password
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
|
|||||||
@ -504,7 +504,7 @@ func (self *WareHouse) UrlIsDownloading(url string) (string,bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
return "",false
|
return "",false
|
||||||
}
|
}
|
||||||
@ -529,7 +529,7 @@ func (self *WareHouse) RemoveGame() {
|
|||||||
cur_li.Value["file"]))
|
cur_li.Value["file"]))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if cur_li.Value["type"] == "launcher" ||
|
} else if cur_li.Value["type"] == "launcher" ||
|
||||||
@ -627,7 +627,7 @@ func (self *WareHouse) Click() {
|
|||||||
gid,err := self.rpcc.AddURI([]string{remote_file_url},outfile)
|
gid,err := self.rpcc.AddURI([]string{remote_file_url},outfile)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}else {
|
}else {
|
||||||
fmt.Println("Warehouse Click game is downloading, ",gid)
|
fmt.Println("Warehouse Click game is downloading, ",gid)
|
||||||
fmt.Println(remote_file_url)
|
fmt.Println(remote_file_url)
|
||||||
@ -719,16 +719,18 @@ func (self *WareHouse) OnKbdReturnBackCb() {
|
|||||||
defer db.Close()
|
defer db.Close()
|
||||||
|
|
||||||
stmt, err := db.Prepare("SELECT count(*) FROM warehouse WHERE title= ?")
|
stmt, err := db.Prepare("SELECT count(*) FROM warehouse WHERE title= ?")
|
||||||
|
defer stmt.Close()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
defer stmt.Close()
|
|
||||||
|
|
||||||
var cnt_str string
|
var cnt_str string
|
||||||
cnt := 0
|
cnt := 0
|
||||||
err = stmt.QueryRow(inputed).Scan(&cnt_str)
|
err = stmt.QueryRow(inputed).Scan(&cnt_str)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
|
cnt_str = "0"
|
||||||
}else {
|
}else {
|
||||||
cnt,_= strconv.Atoi(cnt_str)
|
cnt,_= strconv.Atoi(cnt_str)
|
||||||
}
|
}
|
||||||
@ -754,7 +756,7 @@ func (self *WareHouse) OnKbdReturnBackCb() {
|
|||||||
inputed,_url)
|
inputed,_url)
|
||||||
_, err = db.Exec(sql_insert)
|
_, err = db.Exec(sql_insert)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
self.SyncList()
|
self.SyncList()
|
||||||
|
|||||||
@ -194,7 +194,7 @@ func (self *FootBar) UpdateNavText(texts string) {
|
|||||||
func (self *FootBar) SetLabelTexts(texts [5]string) {
|
func (self *FootBar) SetLabelTexts(texts [5]string) {
|
||||||
keynames := [5]string{"nav", "x", "y", "a", "b"}
|
keynames := [5]string{"nav", "x", "y", "a", "b"}
|
||||||
if len(texts) < 5 {
|
if len(texts) < 5 {
|
||||||
log.Fatal("SetLabelTexts texts length error")
|
log.Println("SetLabelTexts texts length error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -286,7 +286,7 @@ func (self *MainScreen) ExtraName(name string) string {
|
|||||||
func (self *MainScreen) IsExecPackage(dirname string) bool {
|
func (self *MainScreen) IsExecPackage(dirname string) bool {
|
||||||
files, err := ioutil.ReadDir(dirname)
|
files, err := ioutil.ReadDir(dirname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -306,7 +306,7 @@ func (self *MainScreen) IsPluginPackage(dirname string) bool {
|
|||||||
ret := false
|
ret := false
|
||||||
files, err := ioutil.ReadDir(dirname)
|
files, err := ioutil.ReadDir(dirname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -328,7 +328,7 @@ func (self *MainScreen) IsEmulatorPackage(dirname string) bool {
|
|||||||
ret := false
|
ret := false
|
||||||
files, err := ioutil.ReadDir(dirname)
|
files, err := ioutil.ReadDir(dirname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Println(err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ func NewSkinManager() *SkinManager {
|
|||||||
|
|
||||||
func (self *SkinManager) ConvertToRGB(hexstr string) *color.Color {
|
func (self *SkinManager) ConvertToRGB(hexstr string) *color.Color {
|
||||||
if len(hexstr) < 7 || string(hexstr[0]) != "#" { // # 00 00 00
|
if len(hexstr) < 7 || string(hexstr[0]) != "#" { // # 00 00 00
|
||||||
log.Fatalf("ConvertToRGB hex string format error %s", hexstr)
|
log.Printf("ConvertToRGB hex string format error %s\n", hexstr)
|
||||||
//fmt.Printf("ConvertToRGB hex string format error %s", hexstr)
|
//fmt.Printf("ConvertToRGB hex string format error %s", hexstr)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -102,7 +102,7 @@ func IsAFile(path string) bool {
|
|||||||
func MakeExecutable(path string) {
|
func MakeExecutable(path string) {
|
||||||
fileInfo, err := os.Stat(path)
|
fileInfo, err := os.Stat(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("os.Stat %s failed", path)
|
log.Printf("os.Stat %s failed\n", path)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
mode := fileInfo.Mode()
|
mode := fileInfo.Mode()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user