Swift 4

.idea/codeStyles/Project.xml

@@ -0,0 +1,32 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="ClassPredef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Class" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="mm" header="h" fileNamingConvention="NONE" />
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>

kplayer.xcodeproj/project.pbxproj

@@ -306,7 +306,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Marco Schmickler";
 				TargetAttributes = {
 					C98AF5CE1B124D6A00D196CC = {
@@ -488,14 +488,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -536,14 +542,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

kplayer/Info.plist

@@ -53,6 +53,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

kplayer/core/MediaItem.swift

@@ -96,7 +96,7 @@ class MediaItem: CustomDebugStringConvertible {
 
     fileprivate func computeSortName(_ sname: String) -> String {
         var lsortName = sname.replacingOccurrences(of: "full", with: "")
-        var fullNameArr = lsortName.characters.split {
+        var fullNameArr = lsortName.split {
             $0 == "_"
         }.map {
             String($0)
@@ -106,7 +106,7 @@ class MediaItem: CustomDebugStringConvertible {
             lsortName = fullNameArr[0]
         }
 
-        while lsortName.characters.count < 6 {
+        while lsortName.count < 6 {
             lsortName = "0" + lsortName
         }
 
@@ -118,7 +118,7 @@ class MediaItem: CustomDebugStringConvertible {
      Absoluter Pfad mit Slash am Ende.
     */
     var snapshotDirPathForVideo: String {
-        let len = "/srv/samba/ren".characters.count
+        let len = "/srv/samba/ren".count
         let rootPostfix = (root as NSString).substring(from: len)
         let tpath = "/srv/samba/ren/thumb\(rootPostfix)/\(path)/\(name)"
         let enc = tpath.addingPercentEscapes(using: String.Encoding.isoLatin1)!

kplayer/core/NetworkManager.swift

@@ -10,7 +10,7 @@ import Alamofire
 class NetworkManager {
     static let sharedInstance = NetworkManager()
 
-    let baseurl = "http://linkstation.local/tomcat/media"
+    let baseurl = "http://linkstation:8080/tomcat/media"
 
     var authenticated = false
 
@@ -32,10 +32,10 @@ class NetworkManager {
         }
 
         if root.endsWith("/") {
-            root = root[root.startIndex..<root.characters.index(before: root.endIndex)]
+            root = root[root.startIndex..<root.index(before: root.endIndex)]
         }
         let url1 = baseurl + "/service/listvideos" + rootParam
-        let len = root.characters.count
+        let len = root.count
         var res = [MediaItem]()
         let url = (url1 as NSString).replacingOccurrences(of: " ", with: "+")
         print(url)
@@ -48,9 +48,9 @@ class NetworkManager {
                 for s in json {
 //                    print(s)
                     if s.hasSuffix(".mp4") || s.hasSuffix(".m4v") {
-                        let l = s.characters.count
+                        let l = s.count
                         let name = NSURL(fileURLWithPath: s).lastPathComponent!
-                        var pathlen = l - len - name.characters.count
+                        var pathlen = l - len - name.count
 
 //                    if (pathlen > 1000) {
 //                        print(pathlen)
@@ -81,11 +81,11 @@ class NetworkManager {
         }
 
         if root.endsWith("/") {
-            root = root[root.startIndex..<root.characters.index(before: root.endIndex)]
+            root = root[root.startIndex..<root.index(before: root.endIndex)]
         }
 
         let url1 = baseurl + "/service/listpicdirs" + rootParam
-        let len = root.characters.count
+        let len = root.count
         var res = [MediaItem]()
         let url = (url1 as NSString).replacingOccurrences(of: " ", with: "+")
         print(url)
@@ -102,9 +102,9 @@ class NetworkManager {
                 for s in result {
 //                    print(s)
                     if s.lowercased().hasSuffix(".jpg") {
-                        let l = s.characters.count
+                        let l = s.count
                         let name = (s as NSString).lastPathComponent
-                        var pathlen = l - len - name.characters.count
+                        var pathlen = l - len - name.count
 
 //                        print(pathlen)
 //                        print(name)
@@ -117,8 +117,8 @@ class NetworkManager {
                         let path = (s as NSString).substring(with: NSMakeRange(len + 1, pathlen - 2))
 
                         let folderName = NSURL(fileURLWithPath: path).lastPathComponent!
-                        let fl = path.characters.count
-                        let pfl = fl - folderName.characters.count
+                        let fl = path.count
+                        let pfl = fl - folderName.count
 
 //                        print("\(folderName) \(pfl)")
                         let fpath = (path as NSString).substring(with: NSMakeRange(0, pfl))
@@ -146,7 +146,7 @@ class NetworkManager {
     }
 
     func listDirs(_ root: String, completionHandler: @escaping ([MediaItem], Bool) -> Void) -> Void {
-        let len = root.characters.count
+        let len = root.count
         let url = (root as NSString).replacingOccurrences(of: " ", with: "+")
 
         let ux = baseurl + "/service/listdirs" + url
@@ -181,7 +181,7 @@ class NetworkManager {
                                     hasPics = true
 
                                     let name = (root as NSString).lastPathComponent
-                                    let namelen = name.characters.count
+                                    let namelen = name.count
                                     let rootstart = root.substringRight(namelen)
                                     let i = MediaItem(name: name, path: "", root: rootstart, type: ItemType.DETAILS)
                                     res.append(i)

kplayer/detail/VideoPlayerController.swift

@@ -13,7 +13,7 @@ class VideoPlayerController: UIViewController, ItemController {
     var moviePlayer: ALMoviePlayerController?
     var currentItem: MediaItem?
 
-    var completionHandler: ((Void) -> Void)?
+    var completionHandler: (() -> Void)?
 
     var buttons = Dictionary<UIButton, MediaItem>()
 

kplayer/master/MasterViewController.swift

@@ -42,7 +42,7 @@ class MasterViewController: UITableViewController, UISearchResultsUpdating {
         let str = search.searchBar.text!
 
         if str.hasSuffix("*") {
-            let txt = str[str.startIndex ..< str.characters.index(str.endIndex, offsetBy: -1)]
+            let txt = str[str.startIndex ..< str.index(str.endIndex, offsetBy: -1)]
             if let p = model.items[0].parent {
                 let neu = MediaItem(name: txt, path: p.path + "*" + txt, root: p.root, type: ItemType.DETAILS)
                 model.items.append(neu)

kplayer/photo/MediaPhotoController.swift

@@ -10,7 +10,7 @@ import Alamofire
 class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollViewDataSource, NIPhotoScrubberViewDataSource, URLSessionDelegate {
 
     var items = [MediaItem]()
-    var completionHandler: ((Void) -> Void)?
+    var completionHandler: (() -> Void)?
 
     var requests = Array<ImageLoadOperation>()
 
@@ -240,7 +240,7 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView
         if (currentItem.type == ItemType.PICS) {
             let items = currentItem
 
-            let len = items.root.characters.count
+            let len = items.root.count
             let url = NetworkManager.sharedInstance.baseurl + "/service/listfiles" + items.root + "/" + items.path + "/" + items.name
 
             print(items)
@@ -255,9 +255,9 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView
 
                     for s in json as! [String] {
                         if s.hasSuffix(".jpg") {
-                            let l = s.characters.count
+                            let l = s.count
                             let name = NSURL(fileURLWithPath: s).lastPathComponent!
-                            var pathlen = l - len - name.characters.count
+                            var pathlen = l - len - name.count
 
 //                    if (pathlen > 1000) {
                             print(pathlen)

kplayer/util/stringutil.swift

@@ -39,6 +39,6 @@ public extension String {
     }
 
     func length() -> Int {
-        return characters.count
+        return count
     }
 }