Support for custom file systems and remote files

.gitignore

@@ -43,7 +43,7 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-# Pods/
+ **/Pods/
 
 # Carthage
 #

FileBrowser.xcodeproj/project.pbxproj

@@ -33,6 +33,15 @@
 		349A12361C707E86005435C0 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 349A122F1C707E86005435C0 /* [email protected] */; };
 		349A12371C707E86005435C0 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 349A12301C707E86005435C0 /* [email protected] */; };
 		349A12381C707E86005435C0 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 349A12311C707E86005435C0 /* [email protected] */; };
+		C3308C8F1E3501BE00F4D125 /* FBResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3308C8E1E3501BE00F4D125 /* FBResult.swift */; };
+		C3308C901E351F9D00F4D125 /* FileParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3439AB671C6F203A0058AF04 /* FileParser.swift */; };
+		C3308C911E351FB500F4D125 /* FBFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349A12271C707B1A005435C0 /* FBFile.swift */; };
+		C3308C921E351FCF00F4D125 /* FBResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3308C8E1E3501BE00F4D125 /* FBResult.swift */; };
+		C3308C931E351FE900F4D125 /* FileBrowserDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BF0DFB1E13F4A80009D12C /* FileBrowserDataSource.swift */; };
+		C3BF0DFC1E13F4A80009D12C /* FileBrowserDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BF0DFB1E13F4A80009D12C /* FileBrowserDataSource.swift */; };
+		C3BF0E001E1534070009D12C /* LoadingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3BF0DFF1E1534070009D12C /* LoadingViewController.xib */; };
+		C3BF0E021E153A2C0009D12C /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BF0E011E153A2C0009D12C /* LoadingViewController.swift */; };
+		C3C2AC201EC25F470060AECA /* FileBrowserDownloadDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C2AC1D1EC25A6F0060AECA /* FileBrowserDownloadDelegate.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,15 +55,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		3437405A1C6E7DA50090FD6A /* FileListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileListViewController.swift; sourceTree = "<group>"; };
+		3437405A1C6E7DA50090FD6A /* FileListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FileListViewController.swift; sourceTree = "<group>"; };
 		3439AB671C6F203A0058AF04 /* FileParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileParser.swift; sourceTree = "<group>"; };
 		3439AB691C6FC6D90058AF04 /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = System/Library/Frameworks/QuickLook.framework; sourceTree = SDKROOT; };
 		3439AB6B1C6FD6650058AF04 /* FileListPreview.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileListPreview.swift; sourceTree = "<group>"; };
-		3439AB6F1C6FF68C0058AF04 /* FileBrowser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowser.swift; sourceTree = "<group>"; };
+		3439AB6F1C6FF68C0058AF04 /* FileBrowser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FileBrowser.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		343C44611C73CC8100D874FB /* PreviewTransitionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewTransitionViewController.swift; sourceTree = "<group>"; };
-		343C44651C73CD3200D874FB /* PreviewManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewManager.swift; sourceTree = "<group>"; };
+		343C44651C73CD3200D874FB /* PreviewManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = PreviewManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		343C44671C73CD8700D874FB /* PreviewTransitionViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PreviewTransitionViewController.xib; sourceTree = "<group>"; };
-		343C44781C73CFC400D874FB /* WebviewPreviewViewContoller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebviewPreviewViewContoller.swift; sourceTree = "<group>"; };
+		343C44781C73CFC400D874FB /* WebviewPreviewViewContoller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WebviewPreviewViewContoller.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		343C447C1C73CFD900D874FB /* WebviewPreviewViewContoller.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WebviewPreviewViewContoller.xib; sourceTree = "<group>"; };
 		343C447E1C73D06200D874FB /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		344169541C67812400B93D28 /* FileBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -66,15 +75,20 @@
 		3441DC601C71235C005CC2FA /* 3crBXeO.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = 3crBXeO.gif; sourceTree = "<group>"; };
 		3441DC621C712370005CC2FA /* Stitch.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = Stitch.jpg; sourceTree = "<group>"; };
 		349A12231C70725D005435C0 /* FileListSearch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileListSearch.swift; sourceTree = "<group>"; };
-		349A12251C707317005435C0 /* FileListTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileListTableView.swift; sourceTree = "<group>"; };
-		349A12271C707B1A005435C0 /* FBFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FBFile.swift; sourceTree = "<group>"; };
+		349A12251C707317005435C0 /* FileListTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FileListTableView.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		349A12271C707B1A005435C0 /* FBFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FBFile.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		349A122B1C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		349A122C1C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		349A122D1C707E86005435C0 /* FileBrowser.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FileBrowser.xib; sourceTree = "<group>"; };
 		349A122E1C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		349A122F1C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		349A12301C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		349A12311C707E86005435C0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		C3308C8E1E3501BE00F4D125 /* FBResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FBResult.swift; sourceTree = "<group>"; };
+		C3BF0DFB1E13F4A80009D12C /* FileBrowserDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowserDataSource.swift; sourceTree = "<group>"; };
+		C3BF0DFF1E1534070009D12C /* LoadingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoadingViewController.xib; sourceTree = "<group>"; };
+		C3BF0E011E153A2C0009D12C /* LoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LoadingViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		C3C2AC1D1EC25A6F0060AECA /* FileBrowserDownloadDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FileBrowserDownloadDelegate.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +117,9 @@
 			children = (
 				3439AB671C6F203A0058AF04 /* FileParser.swift */,
 				349A12271C707B1A005435C0 /* FBFile.swift */,
+				C3BF0DFB1E13F4A80009D12C /* FileBrowserDataSource.swift */,
+				C3308C8E1E3501BE00F4D125 /* FBResult.swift */,
+				C3C2AC1D1EC25A6F0060AECA /* FileBrowserDownloadDelegate.swift */,
 			);
 			name = Data;
 			sourceTree = "<group>";
@@ -121,6 +138,7 @@
 		343C44601C73CC3C00D874FB /* Preview */ = {
 			isa = PBXGroup;
 			children = (
+				C3BF0E011E153A2C0009D12C /* LoadingViewController.swift */,
 				343C44611C73CC8100D874FB /* PreviewTransitionViewController.swift */,
 				343C44651C73CD3200D874FB /* PreviewManager.swift */,
 				343C44781C73CFC400D874FB /* WebviewPreviewViewContoller.swift */,
@@ -187,6 +205,7 @@
 				349A122B1C707E86005435C0 /* [email protected] */,
 				349A122C1C707E86005435C0 /* [email protected] */,
 				349A122D1C707E86005435C0 /* FileBrowser.xib */,
+				C3BF0DFF1E1534070009D12C /* LoadingViewController.xib */,
 				349A122E1C707E86005435C0 /* [email protected] */,
 				349A122F1C707E86005435C0 /* [email protected] */,
 				349A12301C707E86005435C0 /* [email protected] */,
@@ -294,6 +313,7 @@
 				343C44681C73CD8700D874FB /* PreviewTransitionViewController.xib in Resources */,
 				349A12331C707E86005435C0 /* [email protected] in Resources */,
 				349A12341C707E86005435C0 /* FileBrowser.xib in Resources */,
+				C3BF0E001E1534070009D12C /* LoadingViewController.xib in Resources */,
 				343C447D1C73CFD900D874FB /* WebviewPreviewViewContoller.xib in Resources */,
 				349A12361C707E86005435C0 /* [email protected] in Resources */,
 				349A12371C707E86005435C0 /* [email protected] in Resources */,
@@ -319,23 +339,31 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				349A12281C707B1A005435C0 /* FBFile.swift in Sources */,
+				C3C2AC201EC25F470060AECA /* FileBrowserDownloadDelegate.swift in Sources */,
 				343C447A1C73CFC400D874FB /* WebviewPreviewViewContoller.swift in Sources */,
 				3439AB701C6FF68C0058AF04 /* FileBrowser.swift in Sources */,
 				349A12261C707317005435C0 /* FileListTableView.swift in Sources */,
+				C3308C8F1E3501BE00F4D125 /* FBResult.swift in Sources */,
 				343C44661C73CD3200D874FB /* PreviewManager.swift in Sources */,
 				3439AB681C6F203A0058AF04 /* FileParser.swift in Sources */,
-				349A12281C707B1A005435C0 /* FBFile.swift in Sources */,
 				343C44631C73CC8100D874FB /* PreviewTransitionViewController.swift in Sources */,
+				C3BF0DFC1E13F4A80009D12C /* FileBrowserDataSource.swift in Sources */,
 				3437405B1C6E7DA50090FD6A /* FileListViewController.swift in Sources */,
 				349A12241C70725D005435C0 /* FileListSearch.swift in Sources */,
 				3439AB6C1C6FD6650058AF04 /* FileListPreview.swift in Sources */,
+				C3BF0E021E153A2C0009D12C /* LoadingViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		3441695A1C67812400B93D28 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C3308C901E351F9D00F4D125 /* FileParser.swift in Sources */,
+				C3308C911E351FB500F4D125 /* FBFile.swift in Sources */,
+				C3308C921E351FCF00F4D125 /* FBResult.swift in Sources */,
+				C3308C931E351FE900F4D125 /* FileBrowserDataSource.swift in Sources */,
 				344169641C67812400B93D28 /* FileBrowserTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -370,8 +398,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -421,8 +447,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -455,6 +479,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 6;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = FileBrowser/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -475,6 +500,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 6;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = FileBrowser/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;

FileBrowser/FBFile.swift

@@ -7,21 +7,38 @@
 //
 
 import Foundation
+import UIKit
 
 /// FBFile is a class representing a file in FileBrowser
-open class FBFile: NSObject {
+public protocol FBFile {
+    var displayName: String { get }
+
+    /// Describes the path in the current file system, e.g. /dir/file.txt
+    var path: URL { get }
+
+    /// Describes where the resource can be found. May be a file:// or http[s]:// URL
+    var resourceUrl: URL? { get }
+
+    var isDirectory: Bool { get }
+    var fileExtension: String? { get }
+    var type: FBFileType { get }
+    var isRemoteFile: Bool { get }
+}
+
+open class BasicFBFile: NSObject, FBFile {
     /// Display name. String.
-    open let displayName: String
+    open var displayName: String
     // is Directory. Bool.
     open let isDirectory: Bool
     /// File extension.
     open let fileExtension: String?
-    /// File attributes (including size, creation date etc).
-    open let fileAttributes: NSDictionary?
-    /// NSURL file path.
-    open let filePath: URL
+
+    open var resourceUrl: URL?
     // FBFileType
-    open let type: FBFileType
+    open var type: FBFileType
+
+
+    open let path: URL
 
     /**
      Initialize an FBFile object with a filePath
@@ -30,26 +47,31 @@ open class FBFile: NSObject {
 
      - returns: FBFile object.
      */
-    init(filePath: URL) {
-        self.filePath = filePath
-        let isDirectory = checkDirectory(filePath)
-        self.isDirectory = isDirectory
+    public init(path: URL) {
+        self.path = path
+        self.isDirectory = checkDirectory(path)
+
         if self.isDirectory {
-            self.fileAttributes = nil
             self.fileExtension = nil
             self.type = .Directory
         }
         else {
-            self.fileAttributes = getFileAttributes(self.filePath)
-            self.fileExtension = filePath.pathExtension
-            if let fileExtension = fileExtension {
-                self.type = FBFileType(rawValue: fileExtension) ?? .Default
-            }
-            else {
+            if path.pathExtension != "" {
+                self.fileExtension = path.pathExtension
+                self.type = FBFileType(rawValue: fileExtension!) ?? .Default
+            } else {
+                self.fileExtension = nil
                 self.type = .Default
             }
         }
-        self.displayName = filePath.lastPathComponent 
+        self.displayName = path.lastPathComponent
+    }
+
+    public var isRemoteFile: Bool {
+        guard let resourceUrl = resourceUrl else {
+            return true
+        }
+        return resourceUrl.scheme == "http" || resourceUrl.scheme == "https"
     }
 }
 
@@ -82,7 +104,7 @@ public enum FBFileType: String {
      - returns: UIImage for file type
      */
     public func image() -> UIImage? {
-        let bundle =  Bundle(for: FileParser.self)
+        let bundle = Bundle(for: FileBrowser.self)
         var fileName = String()
         switch self {
         case .Directory: fileName = "[email protected]"
@@ -104,6 +126,9 @@ public enum FBFileType: String {
  - returns: isDirectory Bool.
  */
 func checkDirectory(_ filePath: URL) -> Bool {
+    if #available(iOS 9.0, *) {
+        return filePath.hasDirectoryPath
+    }
     var isDirectory = false
     do {
         var resourceValue: AnyObject?
@@ -115,13 +140,3 @@ func checkDirectory(_ filePath: URL) -> Bool {
     catch { }
     return isDirectory
 }
-
-func getFileAttributes(_ filePath: URL) -> NSDictionary? {
-    let path = filePath.path
-    let fileManager = FileParser.sharedInstance.fileManager
-    do {
-        let attributes = try fileManager.attributesOfItem(atPath: path) as NSDictionary
-        return attributes
-    } catch {}
-    return nil
-}

FileBrowser/FBResult.swift

@@ -0,0 +1,14 @@
+//
+//  FBResult.swift
+//  FileBrowser
+//
+//  Created by Carl Julius Gödecken on 01/01/2017.
+//  Copyright © 2017 Carl Julius Gödecken.
+//
+
+import Foundation
+
+public enum FBResult<T> {
+    case success(T)
+    case error(Error)
+}