Added methods for DCF file system type

hanwen · Feb 9, 2018 · d6f8f3c · d6f8f3c
1 parent a92825e
commit d6f8f3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/fs/select.go b/fs/select.go
@@ -25,8 +25,8 @@ func SelectStorages(dev *mtp.Device, pat string) ([]uint32, error) {
 			return nil, err
 		}
 
-		if !s.IsHierarchical() {
-			log.Printf("skipping non hierarchical storage %q", s.StorageDescription)
+		if !s.IsHierarchical() && !s.IsDCF() {
+			log.Printf("skipping non hierarchical or DCF storage %q", s.StorageDescription)
 			continue
 		}
 

diff --git a/mtp/types.go b/mtp/types.go
@@ -116,8 +116,11 @@ type StorageInfo struct {
 }
 
 func (d *StorageInfo) IsHierarchical() bool {
-	return (d.FilesystemType == FST_GenericHierarchical ||
-		d.FilesystemType == FST_DCF)
+        return d.FilesystemType == FST_GenericHierarchical
+}
+
+func (d *StorageInfo) IsDCF() bool {
+	return d.FilesystemType == FST_DCF
 }
 
 func (d *StorageInfo) IsRemovable() bool {