Bugfixes, temporarily remove cancel

README.md

@@ -1,4 +1,10 @@
-# README
+# RiftShare
+
+![GitHub all releases](https://img.shields.io/github/downloads/achhabra2/riftshare/total)
+![GitHub](https://img.shields.io/github/license/achhabra2/riftshare)
+![GitHub Release Date](https://img.shields.io/github/release-date/achhabra2/riftshare)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/achhabra2/riftshare)
+![GitHub Repo stars](https://img.shields.io/github/stars/achhabra2/riftshare?style=social)
 
 ## About
 

app.go

@@ -33,6 +33,7 @@ type App struct {
 	wormholeCancel *context.CancelFunc
 	LogPath        string
 	UserPrefs      settings.UserSettings
+	IsTransferring bool
 }
 
 // NewApp creates a new App application struct
@@ -49,6 +50,7 @@ func (b *App) startup(ctx context.Context) {
 		runtime.LogError(b.ctx, err.Error())
 	}
 	b.UserPrefs = setting
+	b.UserPrefs.Version = "v" + b.GetCurrentVersion()
 	b.c.Notifications = setting.Notifications
 	b.c.OverwriteExisting = setting.Overwrite
 	b.c.DownloadPath = setting.DownloadsDirectory
@@ -144,6 +146,7 @@ func (b *App) SendFile(filePath string) {
 			if filepath.Ext(filePath) == ".zip" {
 				os.Remove(filePath)
 			}
+			return
 		}
 	}()
 }
@@ -161,7 +164,7 @@ func (b *App) SendDirectory(dirPath string) {
 		}
 		runtime.EventsEmit(b.ctx, "send:started", code)
 		runtime.EventsEmit(b.ctx, "send:status", "waiting for receiver")
-		
+
 		s := <-status
 
 		if s.Error != nil {
@@ -348,7 +351,7 @@ func (b *App) UpdateCheckUI() {
 }
 
 func (b *App) GetDownloadsFolder() string {
-	return b.c.DownloadPath
+	return b.UserPrefs.DownloadsDirectory
 }
 
 func (b *App) GetCurrentVersion() string {
@@ -367,7 +370,8 @@ func (b *App) SetDownloadsFolder() string {
 		b.ShowErrorDialog(err.Error())
 	}
 	b.c.DownloadPath = selection
-	return b.c.DownloadPath
+	b.UserPrefs.DownloadsDirectory = selection
+	return b.UserPrefs.DownloadsDirectory
 }
 
 func (b *App) SetOverwriteParam(val bool) bool {

build/darwin/Info.plist

@@ -6,9 +6,9 @@
 	<key>CFBundleName</key><string>RiftShare</string>
 	<key>CFBundleExecutable</key><string>RiftShare</string>
 	<key>CFBundleIdentifier</key><string>app.riftshare</string>
-	<key>CFBundleVersion</key><string>0.1.0</string>
+	<key>CFBundleVersion</key><string>0.1.1</string>
 	<key>CFBundleGetInfoString</key><string>Riftshare - Easy, Secure, Free file sharing</string>
-	<key>CFBundleShortVersionString</key><string>0.1.0</string>
+	<key>CFBundleShortVersionString</key><string>0.1.1</string>
 	<key>CFBundleIconFile</key><string>iconfile.icns</string>
 	<key>LSMinimumSystemVersion</key><string>10.13.0</string>
 	<key>NSHighResolutionCapable</key><string>true</string>

build/windows/RiftShare.exe.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="app.riftshare" version="0.1.0.0" processorArchitecture="amd64"/>
+    <assemblyIdentity type="win32" name="app.riftshare" version="0.1.1.0" processorArchitecture="amd64"/>
     <dependency>
         <dependentAssembly>
             <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>

frontend/src/about.svelte

@@ -25,8 +25,12 @@
 <div class="container p4 text-gray-200">
   <div>
     Riftshare v{version}
-    <button class="text-blue-600" on:click={(event) => window.runtime.BrowserOpenURL("https://github.com/achhabra2/riftshare")}
-      >Github</button
+    <button class="text-blue-600" on:click={(event) => window.runtime.BrowserOpenURL("https://riftshare.app")}
+      >Website</button
+    >
+    <span> | </span>
+    <button class="text-blue-600" on:click={(event) => window.runtime.BrowserOpenURL("https://riftshare.app/faq.html")}
+      >FAQ</button
     >
   </div>
 

frontend/src/receiver.svelte

@@ -106,9 +106,9 @@
   {#if isReceiving}
     <Progress percent={receivePercent} {status}>
       <div class="container grid">
-        <button class="my-2 mx-auto cancel-button" on:click={onCancel}
+        <!-- <button class="my-2 mx-auto cancel-button" on:click={onCancel}
           >Cancel</button
-        >
+        > -->
       </div>
     </Progress>
   {/if}

frontend/src/sender.svelte

@@ -177,19 +177,19 @@
   {#if isSending}
     <Progress percent={sendPercent} {status}>
       <div class="container grid">
-        <button class="my-2 mx-auto cancel-button" on:click={onCancel}
+        <!-- <button class="my-2 mx-auto cancel-button" on:click={onCancel}
           >Cancel</button
-        >
+        > -->
         {#if sendCode}
-          <div class="mx-auto" transition:slide>
+          <div class="mx-auto mt-2" transition:slide>
             <label for="sendCode" class="send-input-label">Send Code</label>
             <input
               id="sendCode"
               readonly
               type="text"
               placeholder="Send code will appear"
               value={sendCode}
-              class="send-input"
+              class="send-input mt-1"
             />
             <button class="send-button" on:click={copyCode}>📄</button>
           </div>

frontend/wailsjs/go/models.ts

@@ -7,6 +7,7 @@ export class UserSettings {
     overwrite: boolean;
     downloadsDirectory: string;
     selfUpdate: boolean;
+    version: string;
 
     static createFrom(source: any = {}) {
         return new UserSettings(source);
@@ -18,5 +19,6 @@ export class UserSettings {
         this.overwrite = source["overwrite"];
         this.downloadsDirectory = source["downloadsDirectory"];
         this.selfUpdate = source["selfUpdate"];
+        this.version = source["version"];
     }
 }

internal/settings/user_settings.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"riftshare/internal/transport"
+	"riftshare/internal/update"
 	"runtime"
 
 	"gopkg.in/yaml.v2"
@@ -16,6 +17,13 @@ type UserSettings struct {
 	Overwrite          bool   `yaml:"overwrite" json:"overwrite"`
 	DownloadsDirectory string `yaml:"downloads_directory" json:"downloadsDirectory"`
 	SelfUpdate         bool   `yaml:"self_update" json:"selfUpdate"`
+	Version            string `yaml:"version" json:"version"`
+}
+
+func getDefaultSettings() UserSettings {
+	ver := "v" + update.Version
+	settings := UserSettings{Notifications: false, Overwrite: true, DownloadsDirectory: transport.UserDownloadsFolder(), SelfUpdate: true, Version: ver}
+	return settings
 }
 
 func SaveUserSettings(settings UserSettings) error {
@@ -38,7 +46,7 @@ func GetUserSettings() (UserSettings, error) {
 	prefs, err := openPrefFile()
 	if err != nil {
 		log.Println(err)
-		return UserSettings{}, err
+		return getDefaultSettings(), err
 	}
 	defer prefs.Close()
 
@@ -47,13 +55,16 @@ func GetUserSettings() (UserSettings, error) {
 	err = decoder.Decode(&settings)
 	if err != nil {
 		log.Println(err)
-		return UserSettings{}, err
+		return getDefaultSettings(), err
 	}
 
+	if settings.Version == "" {
+		settings.SelfUpdate = true
+	}
 	// Check if file is empty
 	if settings == (UserSettings{}) {
 		// Initialize empty settings file
-		settings = UserSettings{Notifications: false, Overwrite: true, DownloadsDirectory: transport.UserDownloadsFolder(), SelfUpdate: true}
+		settings = getDefaultSettings()
 	}
 	return settings, nil
 }

internal/transport/transport.go

@@ -23,13 +23,6 @@ type Client struct {
 	DownloadPath string
 }
 
-// ShowNotification sends a notification if c.Notifications is true.
-func (c *Client) ShowNotification(title, content string) {
-	if c.Notifications {
-		// TODO: Send Notification
-	}
-}
-
 // NewClient returns a new client for sending and receiving using wormhole-william
 func NewClient() *Client {
 	return &Client{Notifications: false, OverwriteExisting: true, DownloadPath: UserDownloadsFolder()}

internal/update/selfupdate.go

@@ -10,7 +10,7 @@ import (
 	"github.com/rhysd/go-github-selfupdate/selfupdate"
 )
 
-const Version = "0.1.0"
+const Version = "0.1.1"
 
 func DoSelfUpdate() bool {
 	v := semver.MustParse(Version)