go-paths-helper API change

Author: cmaglie

Gopkg.lock

@@ -209,7 +209,7 @@ func (release *PlatformRelease) RuntimeProperties() properties.Map {
 // present
 func (release *PlatformRelease) GetLibrariesDir() *paths.Path {
 	libDir := release.InstallDir.Join("libraries")
-	if isDir, _ := libDir.IsDir(); isDir {
+	if libDir.IsDir() {
 		return libDir
 	}
 	return nil

arduino/cores/cores.go

@@ -64,9 +64,7 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) error {
 	}
 
 	// TODO: IS THIS CHECK NEEDED? can we ignore and let it fail at next ReadDir?
-	if isDir, err := path.IsDir(); err != nil {
-		return fmt.Errorf("reading %s stat info: %s", path, err)
-	} else if !isDir {
+	if !path.IsDir() {
 		return fmt.Errorf("%s is not a directory", path)
 	}
 
@@ -103,10 +101,10 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) error {
 		// in the latter case we just move into "hardware" directory and continue
 		var architectureParentPath *paths.Path
 		hardwareSubdirPath := packagerPath.Join("hardware") // ex: .arduino15/packages/arduino/hardware
-		if isDir, _ := hardwareSubdirPath.IsDir(); isDir {
+		if hardwareSubdirPath.IsDir() {
 			// we found the "hardware" directory move down into that
 			architectureParentPath = hardwareSubdirPath // ex: .arduino15/packages/arduino/
-		} else if isDir, _ := packagerPath.IsDir(); isDir {
+		} else if packagerPath.IsDir() {
 			// we are already at the correct level
 			architectureParentPath = packagerPath
 		} else {
@@ -122,7 +120,7 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) error {
 		// Check if we have tools to load, the directory structure is as follows:
 		// - PACKAGER/tools/TOOL-NAME/TOOL-VERSION/... (ex: arduino/tools/bossac/1.7.0/...)
 		toolsSubdirPath := packagerPath.Join("tools")
-		if isDir, _ := toolsSubdirPath.IsDir(); isDir {
+		if toolsSubdirPath.IsDir() {
 			pm.Log.Infof("Checking existence of 'tools' path: %s", toolsSubdirPath)
 			if err := pm.loadToolsFromPackage(targetPackage, toolsSubdirPath); err != nil {
 				return fmt.Errorf("loading tools from %s: %s", toolsSubdirPath, err)
@@ -150,7 +148,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
 			continue
 		}
 		platformPath := packageDir.Join(architecure)
-		if isDir, _ := platformPath.IsDir(); !isDir {
+		if !platformPath.IsDir() {
 			continue
 		}
 
@@ -159,7 +157,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
 		// - ARCHITECTURE/VERSION/boards.txt
 		// We identify them by checking where is the bords.txt file
 		possibleBoardTxtPath := platformPath.Join("boards.txt")
-		if exist, err := possibleBoardTxtPath.Exist(); err != nil {
+		if exist, err := possibleBoardTxtPath.ExistCheck(); err != nil {
 
 			return fmt.Errorf("looking for boards.txt in %s: %s", possibleBoardTxtPath, err)
 
@@ -169,7 +167,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
 			// this is an unversioned Platform
 
 			// FIXME: this check is duplicated, find a better way to handle this
-			if exist, err := platformPath.Join("boards.txt").Exist(); err != nil {
+			if exist, err := platformPath.Join("boards.txt").ExistCheck(); err != nil {
 				return fmt.Errorf("opening boards.txt: %s", err)
 			} else if !exist {
 				continue
@@ -198,7 +196,7 @@ func (pm *PackageManager) loadPlatforms(targetPackage *cores.Package, packageDir
 			versionDirs.FilterDirs()
 			versionDirs.FilterOutHiddenFiles()
 			for _, versionDir := range versionDirs {
-				if exist, err := versionDir.Join("boards.txt").Exist(); err != nil {
+				if exist, err := versionDir.Join("boards.txt").ExistCheck(); err != nil {
 					return fmt.Errorf("opening boards.txt: %s", err)
 				} else if !exist {
 					continue

arduino/cores/packagemanager/loader.go

@@ -50,7 +50,7 @@ func (lm *LibrariesManager) Install(indexLibrary *librariesindex.Release) (*path
 	libPath := libsDir.Join(utils.SanitizeName(indexLibrary.Library.Name))
 	if replaced != nil && replaced.InstallDir.EquivalentTo(libPath) {
 		formatter.Print(fmt.Sprintf("Replacing %s with %s", replaced, indexLibrary))
-	} else if isdir, _ := libPath.IsDir(); isdir {
+	} else if libPath.IsDir() {
 		return nil, fmt.Errorf("destination dir %s already exists, cannot install", libPath)
 	}
 	return libPath, indexLibrary.Resource.Install(lm.DownloadsDir, libsDir, libPath)

arduino/libraries/librariesmanager/install.go

@@ -28,15 +28,15 @@ import (
 
 // Load loads a library from the given LibraryLocation
 func Load(libDir *paths.Path, location LibraryLocation) (*Library, error) {
-	if exist, _ := libDir.Join("library.properties").Exist(); exist {
+	if libDir.Join("library.properties").Exist() {
 		return makeNewLibrary(libDir, location)
 	}
 	return makeLegacyLibrary(libDir, location)
 }
 
 func addUtilityDirectory(library *Library) {
 	utilitySourcePath := library.InstallDir.Join("utility")
-	if isDir, _ := utilitySourcePath.IsDir(); isDir {
+	if utilitySourcePath.IsDir() {
 		library.UtilityDir = utilitySourcePath
 	}
 }
@@ -60,7 +60,7 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
 	library := &Library{}
 	library.Location = location
 	library.InstallDir = libraryDir
-	if exist, _ := libraryDir.Join("src").Exist(); exist {
+	if libraryDir.Join("src").Exist() {
 		library.Layout = RecursiveLayout
 		library.SourceDir = libraryDir.Join("src")
 	} else {

arduino/libraries/loader.go

@@ -41,12 +41,7 @@ func (r *DownloadResource) IsCached(downloadDir *paths.Path) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("getting archive path: %s", err)
 	}
-	exist, err := archivePath.Exist()
-	if err != nil {
-		return false, fmt.Errorf("checking archive existence: %s", err)
-	}
-
-	return exist, nil
+	return archivePath.Exist(), nil
 }
 
 // Download a DownloadResource.

arduino/resources/helpers.go

@@ -76,7 +76,7 @@ func (release *DownloadResource) Install(downloadDir, tempPath, destDir *paths.P
 	}()
 
 	// If the destination dir already exists remove it
-	if isdir, _ := destDir.IsDir(); isdir {
+	if destDir.IsDir() {
 		destDir.RemoveAll()
 	}
 
@@ -110,7 +110,7 @@ func findPackageRoot(parent *paths.Path) (*paths.Path, error) {
 	}
 	var root *paths.Path
 	for _, file := range files {
-		if isdir, _ := file.IsDir(); !isdir {
+		if !file.IsDir() {
 			continue
 		}
 		if root == nil {

arduino/resources/install.go

@@ -35,13 +35,11 @@ func (config *Configuration) HardwareDirectories() (paths.PathList, error) {
 		}
 	}
 
-	dir := config.PackagesDir()
-	if isdir, _ := dir.IsDir(); isdir {
+	if dir := config.PackagesDir(); dir.IsDir() {
 		res.Add(dir)
 	}
 
-	dir = config.SketchbookDir.Join("hardware")
-	if isdir, _ := dir.IsDir(); isdir {
+	if dir := config.SketchbookDir.Join("hardware"); dir.IsDir() {
 		res.Add(dir)
 	}
 

configs/hardware_directories.go

@@ -130,7 +130,7 @@ func proxyConfigsFromIDEPrefs(props properties.Map) error {
 func IDEBundledLibrariesDir() *paths.Path {
 	if IsBundledInDesktopIDE() {
 		libDir := paths.New(*arduinoIDEDirectory, "libraries")
-		if isDir, _ := libDir.IsDir(); isDir {
+		if libDir.IsDir() {
 			return libDir
 		}
 	}