style: lint with go fmt

appimage/release.go

@@ -1,2 +1 @@
 package appimage
-

appimage/types.go

@@ -16,11 +16,10 @@ import (
 	"strings"
 )
 
-
 const (
-	SourceGitHub = "git.github"
+	SourceGitHub    = "git.github"
 	SourceDirectURL = "raw.url"
-	SourceZapIndex = "idx.zap"
+	SourceZapIndex  = "idx.zap"
 )
 
 type SourceMetadata struct {
@@ -30,24 +29,23 @@ type SourceMetadata struct {
 }
 
 type Source struct {
-	Identifier string `json:"identifier,omitempty"`
-	Meta SourceMetadata `json:"meta,omitempty"`
+	Identifier string         `json:"identifier,omitempty"`
+	Meta       SourceMetadata `json:"meta,omitempty"`
 }
 
 type AppImage struct {
-	Filepath   string `json:"filepath"`
-	Executable string `json:"executable"`
-	IconPath   string `json:"icon_path,omitempty"`
+	Filepath        string `json:"filepath"`
+	Executable      string `json:"executable"`
+	IconPath        string `json:"icon_path,omitempty"`
 	IconPathHicolor string `json:"icon_path_hicolor,omitempty"`
-	DesktopFile string `json:"desktop_file,omitempty"`
-	Source Source `json:"source"`
+	DesktopFile     string `json:"desktop_file,omitempty"`
+	Source          Source `json:"source"`
 }
 
 func (appimage AppImage) getBaseName() string {
 	return path.Base(appimage.Filepath)
 }
 
-
 /* ExtractThumbnail helps to extract the thumbnails to config.icons directory
  * with the apps' basename and png as the Name */
 func (appimage *AppImage) ExtractThumbnail(target string) {
@@ -139,15 +137,15 @@ func (appimage AppImage) Extract(dir string, relPath string) string {
 		logger.Debugf("Attempt to extract %s was successful, but no target extracted file", relPath)
 		return ""
 	} else {
-		if fileInfo.Mode() & os.ModeSymlink != 0 {
+		if fileInfo.Mode()&os.ModeSymlink != 0 {
 			link := fileInfo.Name()
 			k, err := os.Readlink(dirIcon)
 
 			if err != nil {
 				return ""
 			}
 			parts := strings.Split(k, "squashfs-root/")
-			relPathSymlink := parts[len(parts) - 1]
+			relPathSymlink := parts[len(parts)-1]
 			logger.Debugf("%s is a symlink to %s, resolving it.", k, link)
 			return appimage.Extract(dir, relPathSymlink)
 
@@ -156,8 +154,6 @@ func (appimage AppImage) Extract(dir string, relPath string) string {
 		}
 	}
 
-
-
 }
 
 /* ExtractDesktopFile helps to extract the thumbnails to config.icons directory
@@ -172,7 +168,7 @@ func (appimage AppImage) ExtractDesktopFile() ([]byte, error) {
 	defer os.RemoveAll(dir)
 
 	logger.Debug("Trying to extract Desktop files")
-	cmd := exec.Command(appimage.Filepath, "--appimage-extract",  "*.desktop")
+	cmd := exec.Command(appimage.Filepath, "--appimage-extract", "*.desktop")
 	cmd.Dir = dir
 
 	err = cmd.Run()
@@ -227,7 +223,6 @@ func (appimage AppImage) ExtractDesktopFile() ([]byte, error) {
 	return data, nil
 }
 
-
 func (appimage *AppImage) ProcessDesktopFile(config config.Store) {
 	ini.PrettyFormat = false
 
@@ -270,9 +265,8 @@ func (appimage *AppImage) ProcessDesktopFile(config config.Store) {
 	targetDesktopFile := path.Join(config.ApplicationStore, fmt.Sprintf("%s.desktop", appimage.Executable))
 	logger.Debugf("Preparing %s for writing new desktop file", targetDesktopFile)
 
-
 	// add Exec
-	desktopEntry.Key("Exec").SetValue(fmt.Sprintf("%s %%U", appimage.Executable ))
+	desktopEntry.Key("Exec").SetValue(fmt.Sprintf("%s %%U", appimage.Executable))
 
 	err = desktopFile.SaveTo(targetDesktopFile)
 	if err != nil {
@@ -284,5 +278,3 @@ func (appimage *AppImage) ProcessDesktopFile(config config.Store) {
 	// and they completed, happily ever after
 	logger.Debugf("Desktop file successfully written to %s", targetDesktopFile)
 }
-
-

appimage/utils.go

@@ -93,7 +93,7 @@ func Install(options types.InstallOptions, config config.Store) error {
 		}
 	}
 
-	if ! options.Silent {
+	if !options.Silent {
 		// let the user know what is going to happen next
 		fmt.Printf("Downloading %s of size %s. \n", tui.Green(asset.Name), tui.Yellow(asset.Size))
 		confirmDownload := false
@@ -168,7 +168,7 @@ func Install(options types.InstallOptions, config config.Store) error {
 
 	app.Source = Source{
 		Identifier: sourceIdentifier,
-		Meta:       SourceMetadata{
+		Meta: SourceMetadata{
 			Slug:      sourceSlug,
 			CrawledOn: time.Now().String(),
 		},
@@ -248,7 +248,7 @@ func Upgrade(config config.Store, silent bool) ([]string, error) {
 		options := types.Options{
 			Name:       apps[i],
 			Executable: apps[i],
-			Silent: silent,
+			Silent:     silent,
 		}
 		_, err := update(options, config)
 
@@ -270,7 +270,6 @@ func Upgrade(config config.Store, silent bool) ([]string, error) {
 	return updatedApps, nil
 }
 
-
 // Update method is a safe wrapper script which exposes update to the Command Line interface
 // also handles those appimages which are up to date
 func Update(options types.Options, config config.Store) error {
@@ -318,8 +317,6 @@ func RemoveAndInstall(options types.InstallOptions, config config.Store, app *Ap
 	return app, err
 }
 
-
-
 func update(options types.Options, config config.Store) (*AppImage, error) {
 	logger.Debugf("Bootstrapping updater", options.Name)
 	app := &AppImage{}
@@ -342,7 +339,7 @@ func update(options types.Options, config config.Store) (*AppImage, error) {
 		return app, err
 	}
 
-	if ! checkIfUpdateInformationExists(app.Filepath) {
+	if !checkIfUpdateInformationExists(app.Filepath) {
 
 		logger.Debug("This app has no update information embedded")
 
@@ -380,7 +377,6 @@ func update(options types.Options, config config.Store) (*AppImage, error) {
 				return nil, errors.New("appimage has no update information")
 			}
 
-
 		}
 	}
 
@@ -429,7 +425,6 @@ func update(options types.Options, config config.Store) (*AppImage, error) {
 	return app, nil
 }
 
-
 // checkIfUpdateInformationExists checks if the appimage contains Update Information
 // adapted directly from https://github.com/AppImageCrafters/appimage-update
 func checkIfUpdateInformationExists(f string) bool {
@@ -491,7 +486,7 @@ func Remove(options types.RemoveOptions, config config.Store) error {
 		os.Remove(app.DesktopFile)
 	}
 
-    binDir := path.Join(xdg.Home, ".local", "bin")
+	binDir := path.Join(xdg.Home, ".local", "bin")
 	binFile := path.Join(binDir, options.Executable)
 
 	if helpers.CheckIfFileExists(binFile) {
@@ -504,11 +499,10 @@ func Remove(options types.RemoveOptions, config config.Store) error {
 		}
 	}
 
-    logger.Debugf("Removing appimage, %s", app.Filepath)
+	logger.Debugf("Removing appimage, %s", app.Filepath)
 	bar.Describe("Removing AppImage")
 	_ = os.Remove(app.Filepath)
 
-
 	logger.Debugf("Removing index file, %s", indexFile)
 	_ = os.Remove(indexFile)
 

config/config.go

@@ -28,11 +28,10 @@ type Store struct {
 
 const (
 	IntegrateAlways = "yes"
-	IntegrateNever = "no"
-	IntegrateAsk = "ask"
+	IntegrateNever  = "no"
+	IntegrateAsk    = "ask"
 )
 
-
 func (store *Store) populateDefaults() {
 	localStore, err := xdg.DataFile("zap/v2")
 	iconStore, err_ := xdg.DataFile("zap/v2/icons")
@@ -156,7 +155,6 @@ func NewZapConfig(configPath string) (*Store, error) {
 	return defStore, nil
 }
 
-
 // NewZapConfigInteractive helps to create an interactive command line
 // interface.
 func NewZapConfigInteractive(configPath string) (*Store, error) {

config/init.go

@@ -3,4 +3,3 @@ package config
 import "github.com/srevinsaju/zap/logging"
 
 var logger = logging.GetLogger()
-

config/path.go

@@ -19,4 +19,4 @@ func GetPath() string {
 		zapConfigPath = zapXdgCompliantConfigPath
 	}
 	return zapConfigPath
-}
+}

daemon/helpers.go

@@ -25,8 +25,6 @@ func CheckIfRunningSystemd() bool {
 	return false
 }
 
-
-
 // CheckIfInvokedBySystemd returns true if this process has been invoked
 // by systemd directly or indirectly, false in case it hasn't, the system is not
 // using systemd, or we are not sure
@@ -44,4 +42,4 @@ func CheckIfInvokedBySystemd() bool {
 	}
 	log.Println("Probably not launched by systemd (please file an issue if this is wrong)")
 	return false
-}
+}

daemon/main.go

@@ -16,12 +16,11 @@ var logger = logging.GetLogger()
 
 type UpdateFunction func() ([]string, error)
 
-
 func upgrade(c chan int, s chan os.Signal, updater UpdateFunction) {
 
 	for {
 		select {
-		case <- c:
+		case <-c:
 			apps, _ := updater()
 			if len(apps) > 0 {
 				logger.Infof("Apps have been updated, %s", apps)
@@ -34,7 +33,6 @@ func upgrade(c chan int, s chan os.Signal, updater UpdateFunction) {
 				logger.Infof("All apps up-to-date")
 			}
 
-
 		case <-s:
 			fmt.Println("quit")
 			return
@@ -61,7 +59,6 @@ func Sync(updater UpdateFunction) {
 			time.Sleep(time.Hour)
 		}
 
-
 	}()
 	upgrade(c, s, updater)
 }
@@ -79,4 +76,3 @@ func waitUntilOnline() {
 		isOnline = helpers.CheckIfOnline()
 	}
 }
-

daemon/systemd.go

@@ -50,7 +50,7 @@ Description=Zap Updater daemon
 After=syslog.target network.target
 [Service]
 Type=simple
-ExecStart=` +  self + ` daemon
+ExecStart=` + self + ` daemon
 LimitNOFILE=65536
 RestartSec=3
 Restart=always
@@ -61,7 +61,6 @@ Environment=LAUNCHED_BY_SYSTEMD=1
 [Install]
 WantedBy=default.target`)
 
-
 	logger.Debugf("Writing zapd.service to %s", pathToServiceDir)
 	err = ioutil.WriteFile(path.Join(pathToServiceDir, "zapd.service"), systemdService, 0644)
 	if err != nil {
@@ -78,8 +77,6 @@ WantedBy=default.target`)
 	return nil
 }
 
-
-
 // SetupToRunThroughSystemd checks if this process has been launched through
 // systemd on a systemd system and takes appropriate measures if it has not,
 // either because systemd was not yet set up to launch it, or because
@@ -156,4 +153,3 @@ func SetupToRunThroughSystemd() error {
 	return nil
 
 }
-

index/github.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 )
 
-
 func getRelease(releases []*github.RepositoryRelease, tag string) *github.RepositoryRelease {
 	for i := range releases {
 		if *releases[i].TagName == tag {
@@ -31,7 +30,6 @@ func getAsset(assets []*github.ReleaseAsset, name string) *github.ReleaseAsset {
 	return nil
 }
 
-
 func GitHubSurveyUserReleases(options types.InstallOptions, config config.Store) (types.ZapDlAsset, error) {
 	var asset types.ZapDlAsset
 
@@ -40,7 +38,7 @@ func GitHubSurveyUserReleases(options types.InstallOptions, config config.Store)
 
 	slugProcessed := strings.Split(options.From, "/")
 
-	owner, repo := slugProcessed[len(slugProcessed) - 2], slugProcessed[len(slugProcessed) - 1]
+	owner, repo := slugProcessed[len(slugProcessed)-2], slugProcessed[len(slugProcessed)-1]
 	logger.Debugf("Fetching releases from %s/%s", owner, repo)
 
 	releases, _, err := client.Repositories.ListReleases(context.Background(), owner, repo, &github.ListOptions{})
@@ -113,7 +111,7 @@ func GitHubSurveyUserReleases(options types.InstallOptions, config config.Store)
 	return types.ZapDlAsset{
 		Name:     *assetGitHub.Name,
 		Download: *assetGitHub.BrowserDownloadURL,
-		Size:     strconv.Itoa(*assetGitHub.Size / 1_000_000) + " MB",
+		Size:     strconv.Itoa(*assetGitHub.Size/1_000_000) + " MB",
 	}, err
 
-}
+}

index/init.go

@@ -4,4 +4,4 @@ import (
 	"github.com/srevinsaju/zap/logging"
 )
 
-var logger = logging.GetLogger()
+var logger = logging.GetLogger()

index/zap.go

@@ -132,7 +132,6 @@ func GetZapReleases(executable string, config config.Store) (*types.ZapReleases,
 	return zapReleases, nil
 }
 
-
 func ZapSurveyUserReleases(options types.InstallOptions, config config.Store) (types.ZapDlAsset, error) {
 
 	asset := types.ZapDlAsset{}
@@ -162,7 +161,7 @@ func ZapSurveyUserReleases(options types.InstallOptions, config config.Store) (t
 		// do not show the options when the user are requested silence
 		return types.ZapDlAsset{}, exceptions.SilenceRequestedError
 
-	} else  {
+	} else {
 		// there are a lot of items in the release, hmm...
 		logger.Debug("Preparing survey for release selection")
 		releasePrompt := &survey.Select{
@@ -184,10 +183,8 @@ func ZapSurveyUserReleases(options types.InstallOptions, config config.Store) (t
 		return types.ZapDlAsset{}, err
 	}
 
-
 	logger.Debugf("Running on GOARCH: %s", runtime.GOARCH)
 
-
 	var filteredAssets map[string]types.ZapDlAsset
 	if options.DoNotFilter == true {
 		logger.Debug("Explicitly not filtering")
@@ -224,4 +221,4 @@ func ZapSurveyUserReleases(options types.InstallOptions, config config.Store) (t
 
 	logger.Debug(asset)
 	return asset, nil
-}
+}