Add sha1Hash method

Author: Qata

.gitignore

@@ -49,8 +49,7 @@ playground.xcworkspace
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
 
 # fastlane

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "CryptoSwift"]
+	path = CryptoSwift
+	url = https://github.com/krzyzanowskim/CryptoSwift.git

BencodeKit.xcodeproj/project.pbxproj

@@ -13,6 +13,8 @@
 		9EA794CF1E3B1D42000D6C50 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EB798381E3AEE1F005A7C9E /* List.swift */; };
 		9EA794D01E3B1E0F000D6C50 /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA794CB1E3B0F82000D6C50 /* Decode.swift */; };
 		9EA794D11E3B1E8F000D6C50 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EB798361E3AEE1F005A7C9E /* Dictionary.swift */; };
+		9EA794EB1E41D11A000D6C50 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EA794E71E41D104000D6C50 /* CryptoSwift.framework */; };
+		9EA794ED1E41DC86000D6C50 /* OrderedDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA794EC1E41DC86000D6C50 /* OrderedDictionary.swift */; };
 		9EB798241E3AE7EA005A7C9E /* BencodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB7981A1E3AE7EA005A7C9E /* BencodeKit.framework */; };
 		9EB798291E3AE7EA005A7C9E /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EB798281E3AE7EA005A7C9E /* Tests.swift */; };
 		9EB7982B1E3AE7EA005A7C9E /* BencodeKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EB7981D1E3AE7EA005A7C9E /* BencodeKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -22,6 +24,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		9EA794E61E41D104000D6C50 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9EA794E11E41D104000D6C50 /* CryptoSwift.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 754BE45519693E190098E6F3;
+			remoteInfo = CryptoSwift;
+		};
+		9EA794E81E41D104000D6C50 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9EA794E11E41D104000D6C50 /* CryptoSwift.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 754BE46019693E190098E6F3;
+			remoteInfo = Tests;
+		};
 		9EB798251E3AE7EA005A7C9E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9EB7980F1E3AE7B7005A7C9E /* Project object */;
@@ -34,6 +50,8 @@
 /* Begin PBXFileReference section */
 		9EA794C91E3B0E44000D6C50 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = Sources/Types/Extensions.swift; sourceTree = "<group>"; };
 		9EA794CB1E3B0F82000D6C50 /* Decode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Decode.swift; sourceTree = "<group>"; };
+		9EA794E11E41D104000D6C50 /* CryptoSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CryptoSwift.xcodeproj; path = Carthage/Checkouts/CryptoSwift/CryptoSwift.xcodeproj; sourceTree = "<group>"; };
+		9EA794EC1E41DC86000D6C50 /* OrderedDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedDictionary.swift; sourceTree = "<group>"; };
 		9EB7981A1E3AE7EA005A7C9E /* BencodeKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BencodeKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9EB7981D1E3AE7EA005A7C9E /* BencodeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BencodeKit.h; sourceTree = "<group>"; };
 		9EB7981E1E3AE7EA005A7C9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -53,6 +71,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9EA794EB1E41D11A000D6C50 /* CryptoSwift.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -67,12 +86,31 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		9EA794E21E41D104000D6C50 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9EA794E71E41D104000D6C50 /* CryptoSwift.framework */,
+				9EA794E91E41D104000D6C50 /* Tests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9EA794EA1E41D109000D6C50 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				9EA794E11E41D104000D6C50 /* CryptoSwift.xcodeproj */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9EB7980E1E3AE7B7005A7C9E = {
 			isa = PBXGroup;
 			children = (
 				9EB798321E3AE884005A7C9E /* Sources */,
 				9EA794C91E3B0E44000D6C50 /* Extensions.swift */,
+				9EA794EC1E41DC86000D6C50 /* OrderedDictionary.swift */,
 				9EB798271E3AE7EA005A7C9E /* Tests */,
+				9EA794EA1E41D109000D6C50 /* Frameworks */,
 				9EB7981B1E3AE7EA005A7C9E /* Products */,
 			);
 			sourceTree = "<group>";
@@ -199,6 +237,12 @@
 			mainGroup = 9EB7980E1E3AE7B7005A7C9E;
 			productRefGroup = 9EB7981B1E3AE7EA005A7C9E /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 9EA794E21E41D104000D6C50 /* Products */;
+					ProjectRef = 9EA794E11E41D104000D6C50 /* CryptoSwift.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				9EB798191E3AE7EA005A7C9E /* BencodeKit */,
@@ -207,6 +251,23 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		9EA794E71E41D104000D6C50 /* CryptoSwift.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = CryptoSwift.framework;
+			remoteRef = 9EA794E61E41D104000D6C50 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		9EA794E91E41D104000D6C50 /* Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = Tests.xctest;
+			remoteRef = 9EA794E81E41D104000D6C50 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		9EB798181E3AE7EA005A7C9E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -236,6 +297,7 @@
 				9EB7983B1E3AEE1F005A7C9E /* Integer.swift in Sources */,
 				9EA794CE1E3B1691000D6C50 /* String.swift in Sources */,
 				9EA794D11E3B1E8F000D6C50 /* Dictionary.swift in Sources */,
+				9EA794ED1E41DC86000D6C50 /* OrderedDictionary.swift in Sources */,
 				9EA794CF1E3B1D42000D6C50 /* List.swift in Sources */,
 				9EA794CA1E3B0E44000D6C50 /* Extensions.swift in Sources */,
 			);

BencodeKit.xcodeproj/project.xcworkspace/xcshareddata/BencodeKit.xcscmblueprint

@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5DACB94A295467AC42BB859D293EBBB616E74CA7",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "5DACB94A295467AC42BB859D293EBBB616E74CA7" : 9223372036854775807,
+    "C3D8ED1CB28D809ADCE2C0DE74935E8A502ACD53" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6F419A56-5F35-417F-BBBB-FC8C714B2AB6",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "5DACB94A295467AC42BB859D293EBBB616E74CA7" : "BencodeKit\/",
+    "C3D8ED1CB28D809ADCE2C0DE74935E8A502ACD53" : "BencodeKit\/CryptoSwift\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "BencodeKit",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "BencodeKit.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:MonadicConsulting\/BencodeKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5DACB94A295467AC42BB859D293EBBB616E74CA7"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/krzyzanowskim\/CryptoSwift.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C3D8ED1CB28D809ADCE2C0DE74935E8A502ACD53"
+    }
+  ]
+}

Cartfile

@@ -0,0 +1 @@
+github "krzyzanowskim/CryptoSwift"

Cartfile.resolved

@@ -0,0 +1 @@
+github "krzyzanowskim/CryptoSwift" "0.6.7"

OrderedDictionary.swift

@@ -0,0 +1,68 @@
+//
+//  OrderedDictionary.swift
+//  BencodeKit
+//
+//  Created by Charlotte Tortorella on 1/2/17.
+//
+//
+
+import Foundation
+
+public struct BencodeDictionary: Collection {
+    public func index(after i: Index) -> Index {
+        return i + 1
+    }
+
+    public var startIndex: Index {
+        return 0
+    }
+    
+    public var endIndex: Index {
+        return elements.count
+    }
+
+    private var elements: [(String, Bencode)] = []
+    
+    public typealias Index = Int
+    
+    var keys: [String] {
+        return elements.map { $0.0 }
+    }
+    
+    var values: [Bencode] {
+        return elements.map { $0.1 }
+    }
+    
+    init(_ elements: [(String, Bencode)] = []) {
+        self.elements = elements
+    }
+    
+    mutating func update(value: Bencode?, forKey key: String) {
+        elements = elements.filter { $0.0 != key }
+        if let value = value {
+            elements.append(key, value)
+        }
+    }
+    
+    func value(forKey key: String) -> Bencode? {
+        return elements.first { $0.0 == key }?.1
+    }
+    
+    public subscript(index: String) -> Bencode? {
+        get {
+            return value(forKey: index)
+        }
+        set(newValue) {
+            update(value: newValue, forKey: index)
+        }
+    }
+    
+    public subscript(index: Index) -> (String, Bencode) {
+        get {
+            return elements[index]
+        }
+        set(newValue) {
+            elements[index] = newValue
+        }
+    }
+}

Sources/Bencode.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2017 Monadic Consulting. All rights reserved.
 //
 
+import CryptoSwift
+
 public enum BencodingError: Error {
     case emptyString
     case nonExistentFile(String)
@@ -19,7 +21,6 @@ public enum BencodingError: Error {
     case unterminatedList(Data.Index)
     case invalidDictionary(Data.Index)
     case nonStringDictionaryKey(Data.Index)
-    case nonAsciiDictionaryKey(Data.Index)
     case unterminatedDictionary(Data.Index)
     case nonAsciiString
 }
@@ -28,7 +29,7 @@ public indirect enum Bencode: Equatable {
     case integer(Int)
     case bytes(Data)
     case list([Bencode])
-    case dictionary([(String, Bencode)])
+    case dictionary(BencodeDictionary)
 
     init(_ integer: Int) {
         self = .integer(integer)
@@ -48,20 +49,51 @@ public indirect enum Bencode: Equatable {
     }
 
     init(_ dictionary: [(String, Bencode)]) {
+        self.init(BencodeDictionary(dictionary))
+    }
+    
+    init(_ dictionary: BencodeDictionary) {
         self = .dictionary(dictionary)
     }
 
-    func stringRepresentation() throws -> String {
+    func encodedString() -> String {
         switch self {
         case .integer(let integer):
             return "i\(String(integer))e"
         case .bytes(let bytes):
-            guard let string = String(bytes: bytes, encoding: .ascii) else { throw BencodingError.nonAsciiString }
+            let string = bytes.reduce("") { string, byte in
+                string.appendingFormat("%c", byte)
+            }
             return "\(string.characters.count):\(string)"
         case .list(let list):
-            return try "l\(list.map({ try $0.stringRepresentation() }).joined())e"
+            return "l\(list.map({ $0.encodedString() }).joined())e"
+        case .dictionary(let dictionary):
+            return "d\(dictionary.map({ "\($0.characters.count):\($0)\($1.encodedString())" }).joined())e"
+        }
+    }
+    
+    func toString() -> String {
+        switch self {
+        case .integer(let integer):
+            return String(integer)
+        case .bytes(let bytes):
+            return bytes.reduce("") { string, byte in
+                string.appendingFormat("%c", byte)
+            }
+        case .list(let list):
+            return "[" + list.map({ $0.toString() }).joined(separator: ", ") + "]"
         case .dictionary(let dictionary):
-            return try "d\(dictionary.map({ "\($0.characters.count):\($0)\(try $1.stringRepresentation())" }).joined())e"
+            return "[" + dictionary.map({ "\"\($0)\": \($1.toString())" }).joined(separator: ", ") + "]"
+        }
+
+    }
+    
+    subscript(index: String) -> Bencode? {
+        get {
+            guard case .dictionary(let dictionary) = self else {
+                return nil
+            }
+            return dictionary[index]
         }
     }
 }
@@ -96,6 +128,14 @@ public extension Bencode {
     }
 }
 
+public extension Bencode {
+    func sha1Hash() -> String {
+        return SHA1().calculate(for: encoded().bytes).reduce("") { hex, byte in
+            hex.appendingFormat("%02x", byte)
+        }
+    }
+}
+
 public extension Bencode {
     public static func ==(lhs: Bencode, rhs: Bencode) -> Bool {
         switch (lhs, rhs) {

Sources/Types/Dictionary.swift

@@ -24,8 +24,9 @@ internal func bdecodeDictionary(_ data: Data, _ index: Data.Index) throws -> (Be
         }
 
         let (valueMatch, nextIndex) = try bdecode(data, valueIndex)
-        guard let stringKey = String(bytes: key, encoding: .ascii) else {
-            throw BencodingError.nonAsciiDictionaryKey(currentIndex)
+        
+        let stringKey = key.reduce("") { string, byte in
+            string.appendingFormat("%c", byte)
         }
         values.append(stringKey, valueMatch)
         currentIndex = nextIndex
@@ -34,5 +35,5 @@ internal func bdecodeDictionary(_ data: Data, _ index: Data.Index) throws -> (Be
         }
     }
 
-    return (.dictionary(values), data.index(after: currentIndex))
+    return (.dictionary(BencodeDictionary(values)), data.index(after: currentIndex))
 }

Sources/Types/Integer.swift

@@ -21,8 +21,6 @@ internal func bdecodeInteger(_ data: Data, _ index: Data.Index) throws -> (match
         throw BencodingError.negativeZeroEncountered(index)
     }
 
-    print(integerString)
-    
     guard let value = Int(integerString) else {
         throw BencodingError.contaminatedInteger(index)
     }