Commit a3d65ad

committed

file deletions in both flows added.

1 parent 6f86220 commit a3d65adCopy full SHA for a3d65ad

File tree

+35

-9

lines changed

+35

-9

lines changed

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+package GUI`
	`2`	`+`
	`3`	`+import (`
	`4`	`+ "fmt"`
	`5`	`+`
	`6`	`+ "fyne.io/fyne/app"`
	`7`	`+ "fyne.io/fyne/widget"`
	`8`	`+)`
	`9`	`+`
	`10`	`+func LaunchWindow() {`
	`11`	`+ fmt.Println("Launching window...")`
	`12`	`+`
	`13`	`+ app := app.New()`
	`14`	`+ w := app.NewWindow("Hello Window World!")`
	`15`	`+ w.SetContent(widget.NewVBox(`
	`16`	`+ widget.NewLabel("Hello Fyne GUI!"),`
	`17`	`+ widget.NewButton("Quit", func() {`
	`18`	`+ app.Quit()`
	`19`	`+ }),`
	`20`	`+ ))`
	`21`	`+`
	`22`	`+ w.ShowAndRun()`
	`23`	`+}`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -354,12 +354,8 @@ func (encryptor *DesEncryptor) EncryptFile(filename string) bool {`
`354`	`354`	`return false`
`355`	`355`	`}`
`356`	`356`
`357`		`- // // File encryption is successful. Delete the primary file from disk.`
`358`		`- // err = os.Remove(filename)`
`359`		`- // if err != nil {`
`360`		`- // log.Println("Encryption failure for file:", encryptor.encryptionFilename, err)`
`361`		`- // return false`
`362`		`- // }`
	`357`	`+ log.Println("Deleting primary file:", filename)`
	`358`	`+ os.Remove(filename)`
`363`	`359`
`364`	`360`	`log.Println("File-Encryption procedure complete...")`
`365`	`361`	`return true`
`@@ -407,6 +403,9 @@ func (engine *DesEncryptor) DecryptFile(filename string) bool {`
`407`	`403`	`return false`
`408`	`404`	`}`
`409`	`405`
	`406`	`+ log.Println("Removing encrypted file: ", engine.encryptionFilename)`
	`407`	`+ os.Remove(engine.encryptionFilename)`
	`408`	`+`
`410`	`409`	`log.Println("Decryption procedure complete...")`
`411`	`410`	`return true`
`412`	`411`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "FES App Server",`
`3`		`- "port": 8080,`
`4`		`- "protocol": "HTTP"`
	`3`	`+ "port": 9090,`
	`4`	`+ "protocol": "HTTP",`
	`5`	`+ "dbFilePath": "./storage/db.gosotore"`
`5`	`6`	`}`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"net/http"`
`9`	`9`	`"os"`
`10`	`10`	`"reflect"`
	`11`	`+ "strconv"`
`11`	`12`
`12`	`13`	`"github.com/bitly/go-simplejson"`
`13`	`14`	`"github.com/gorilla/mux"`
`@@ -84,5 +85,7 @@ func Start() {`
`84`	`85`	`initServer("config.json", &prop)`
`85`	`86`	`router := mux.NewRouter().StrictSlash(true)`
`86`	`87`	`initServices(router)`
`87`		`- log.Fatalln(http.ListenAndServe(":8080", router))`
	`88`	`+ port := ":" + strconv.Itoa(prop.Port)`
	`89`	`+ log.Fatalln(http.ListenAndServe(port, router))`
	`90`	`+ log.Println("Application started on port: ", prop.Port)`
`88`	`91`	`}`

Comments

(0)