Release Prep (#5)

* Set App ID

* Update deps

* Update vendor

* Update S P A C E

* Update deps & vendor

cmd/fyfoto/browser.go

@@ -51,15 +51,15 @@ func populateLocal(ff *FyFoto, dir fyne.URI) {
 
 func populateSpace(ff *FyFoto) {
 	// Get BC Node
-	node, err := ff.spaceFyne.GetNode(&ff.spaceClient.BCClient)
+	node, err := ff.spaceFyne.Node(ff.spaceClient)
 	if err != nil {
 		ff.spaceFyne.ShowError(err)
 		return
 	}
 	populateSpaceWithNode(ff, node)
 }
 
-func populateSpaceWithNode(ff *FyFoto, node *bcgo.Node) {
+func populateSpaceWithNode(ff *FyFoto, node bcgo.Node) {
 	// TODO Should this show a Progress Bar?
 
 	/* TODO this API was removed in Fyne v2.0.0
@@ -140,7 +140,7 @@ func createBrowser(ff *FyFoto) {
 	ff.spaceToolbar = widget.NewToolbar(
 		widget.NewToolbarAction(theme.ContentAddIcon(), func() {
 			go func() {
-				node, err := ff.spaceFyne.GetNode(&ff.spaceClient.BCClient)
+				node, err := ff.spaceFyne.Node(ff.spaceClient)
 				if err != nil {
 					ff.spaceFyne.ShowError(err)
 					return
@@ -156,18 +156,22 @@ func createBrowser(ff *FyFoto) {
 					name := reader.URI().Name()
 
 					// Show progress dialog
-					progress := dialog.NewProgress("Uploading", "Uploading "+name, ff.spaceFyne.Window)
+					progress := dialog.NewProgress("Uploading", "Uploading "+name, ff.spaceFyne.Window())
 					progress.Show()
-					defer progress.Hide()
 					listener := &bcui.ProgressMiningListener{Func: progress.SetValue}
 
 					reference, err := ff.spaceClient.Add(node, listener, name, reader.URI().MimeType(), reader)
+
+					// Hide progress dialog
+					progress.Hide()
+
 					if err != nil {
 						ff.spaceFyne.ShowError(err)
+						return
 					}
 					fmt.Println("Uploaded:", reference)
 					go populateSpaceWithNode(ff, node)
-				}, ff.spaceFyne.Window)
+				}, ff.spaceFyne.Window())
 				d.SetFilter(storage.NewMimeTypeFileFilter([]string{"image/*"}))
 				d.Show()
 			}()
@@ -183,7 +187,7 @@ func createBrowser(ff *FyFoto) {
 			go ff.spaceFyne.ShowStorage(ff.spaceClient)
 		}),
 		widget.NewToolbarAction(theme.NewThemedResource(bcuidata.AccountIcon), func() {
-			go ff.spaceFyne.ShowAccount(&ff.spaceClient.BCClient)
+			go ff.spaceFyne.ShowAccount(ff.spaceClient)
 		}),
 		widget.NewToolbarAction(theme.HelpIcon(), func() {
 			go ff.spaceFyne.ShowHelp(ff.spaceClient)
@@ -194,7 +198,7 @@ func createBrowser(ff *FyFoto) {
 	)
 	// Create list of thumbnails
 	ff.spaceImages = ui.NewSpaceThumbnailTable(ff.spaceClient, func(id string, timestamp uint64, meta *spacego.Meta) {
-		node, err := ff.spaceFyne.GetNode(&ff.spaceClient.BCClient)
+		node, err := ff.spaceFyne.Node(ff.spaceClient)
 		if err != nil {
 			ff.spaceFyne.ShowError(err)
 			return
@@ -208,7 +212,7 @@ func createBrowser(ff *FyFoto) {
 
 		file := filepath.Join(c, id)
 		if _, err := os.Stat(file); os.IsNotExist(err) {
-			progress := dialog.NewProgressInfinite("Downloading", "Downloading "+meta.Name, ff.spaceFyne.Window)
+			progress := dialog.NewProgressInfinite("Downloading", "Downloading "+meta.Name, ff.spaceFyne.Window())
 			progress.Show()
 			defer progress.Hide()
 

cmd/fyfoto/main.go

@@ -29,8 +29,8 @@ type FyFoto struct {
 	localDirs    *widget.Tree
 	localImages  *ui.LocalThumbnailTable
 
-	spaceClient  *spaceclientgo.SpaceClient
-	spaceFyne    *spacefynego.SpaceFyne
+	spaceClient  spaceclientgo.SpaceClient
+	spaceFyne    spacefynego.SpaceFyne
 	spaceToolbar *widget.Toolbar
 	spaceImages  *ui.SpaceThumbnailTable
 
@@ -57,27 +57,24 @@ func main() {
 	flag.Parse()
 
 	ff := &FyFoto{
-		app:         app.New(),
+		app:         app.NewWithID("us.smhouston.fyfoto"),
 		spaceClient: spaceclientgo.NewSpaceClient(),
 	}
 	ff.rootDir = storage.NewFileURI(*dirPtr)
 	ff.window = ff.app.NewWindow("FyFoto")
 	ff.spaceFyne = spacefynego.NewSpaceFyne(ff.app, ff.window, ff.spaceClient)
-	onSignedIn := ff.spaceFyne.OnSignedIn
-	ff.spaceFyne.OnSignedIn = func(node *bcgo.Node) {
-		if onSignedIn != nil {
-			onSignedIn(node)
+	ff.spaceFyne.AddOnSignedIn(func(bcgo.Account) {
+		node, err := ff.spaceFyne.Node(ff.spaceClient)
+		if err != nil {
+			log.Println(err)
+			return
 		}
 		go populateSpaceWithNode(ff, node)
-	}
-	onSignedOut := ff.spaceFyne.OnSignedOut
-	ff.spaceFyne.OnSignedOut = func() {
-		if onSignedOut != nil {
-			onSignedOut()
-		}
+	})
+	ff.spaceFyne.AddOnSignedOut(func() {
 		ff.spaceImages.Clear()
 		ff.bInfo.SetText("")
-	}
+	})
 
 	createBrowser(ff)
 	createViewer(ff)

go.mod

@@ -3,11 +3,11 @@ module github.com/okratitan/fyfoto
 go 1.12
 
 require (
-	aletheiaware.com/bcfynego v1.1.7
-	aletheiaware.com/bcgo v1.1.4
-	aletheiaware.com/spaceclientgo v1.1.5
-	aletheiaware.com/spacefynego v1.1.4
-	aletheiaware.com/spacego v1.1.4
-	fyne.io/fyne/v2 v2.0.0
-	golang.org/x/image v0.0.0-20201208152932-35266b937fa6
+	aletheiaware.com/bcfynego v1.2.3
+	aletheiaware.com/bcgo v1.2.3
+	aletheiaware.com/spaceclientgo v1.2.4
+	aletheiaware.com/spacefynego v1.2.4
+	aletheiaware.com/spacego v1.2.4
+	fyne.io/fyne/v2 v2.0.2
+	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
 )