From 50e58f7cac43185d8f97dff35e4afb47e58f4a0d Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Sun, 31 Mar 2019 17:33:41 -0400 Subject: [PATCH] Use CrytoSwift instead of string extension --- Cartfile | 3 ++- Cartfile.resolved | 3 ++- Persephone.xcodeproj/project.pbxproj | 30 +++++++++++++++++++++++----- Persephone/Models/Album.swift | 6 ++++++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Cartfile b/Cartfile index 1289acc..11c695b 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,4 @@ github "SwiftyJSON/SwiftyJSON" ~> 4.0 github "PromiseKit/Foundation" ~> 3.0 -github "nhurden/MediaKeyTap" "fix-tis-tsm-error" +github "nhurden/MediaKeyTap" +github "krzyzanowskim/CryptoSwift" diff --git a/Cartfile.resolved b/Cartfile.resolved index 9353d63..813257d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,5 @@ github "PromiseKit/Foundation" "3.3.2" github "SwiftyJSON/SwiftyJSON" "4.2.0" +github "krzyzanowskim/CryptoSwift" "1.0.0" github "mxcl/PromiseKit" "6.8.4" -github "nhurden/MediaKeyTap" "355d346c56243e6d56487fa46fcad945251e16ae" +github "nhurden/MediaKeyTap" "2.2.1" diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index c6bcc75..44be29b 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -51,11 +51,17 @@ E450AD9322262C970091BED3 /* PromiseKit.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = E450AD8C22262C590091BED3 /* PromiseKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E450AD9522262DF10091BED3 /* AlbumArtQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = E450AD9422262DF10091BED3 /* AlbumArtQueue.swift */; }; E450AD98222633920091BED3 /* Alamofire.framework.dSYM in Resources */ = {isa = PBXBuildFile; fileRef = E450AD96222633920091BED3 /* Alamofire.framework.dSYM */; }; - E450AD9D2229B9050091BED3 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = E450AD9C2229B9050091BED3 /* String.swift */; }; E450ADA12229E7C90091BED3 /* PMKFoundation.framework.dSYM in Resources */ = {isa = PBXBuildFile; fileRef = E450AD9F2229E7C90091BED3 /* PMKFoundation.framework.dSYM */; }; E450ADA32229E7E00091BED3 /* PMKFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E450ADA02229E7C90091BED3 /* PMKFoundation.framework */; }; E450ADA42229E7E00091BED3 /* PMKFoundation.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = E450ADA02229E7C90091BED3 /* PMKFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E45962C62241A78500FC1A1E /* MPDCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = E45962C52241A78500FC1A1E /* MPDCommand.swift */; }; + E45E4FDA22515D87004B537F /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = E45E4FD722515D87004B537F /* CHANGELOG.md */; }; + E45E4FDB22515D87004B537F /* Brewfile in Resources */ = {isa = PBXBuildFile; fileRef = E45E4FD822515D87004B537F /* Brewfile */; }; + E45E4FDC22515D87004B537F /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = E45E4FD922515D87004B537F /* Cartfile */; }; + E45E4FDF225168DA004B537F /* CryptoSwift.framework.dSYM in Resources */ = {isa = PBXBuildFile; fileRef = E45E4FDD225168DA004B537F /* CryptoSwift.framework.dSYM */; }; + E45E4FE0225168DA004B537F /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45E4FDE225168DA004B537F /* CryptoSwift.framework */; }; + E45E4FE122516953004B537F /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45E4FDE225168DA004B537F /* CryptoSwift.framework */; }; + E45E4FE222516953004B537F /* CryptoSwift.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = E45E4FDE225168DA004B537F /* CryptoSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E465049A21E94DF500A70F4C /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465049921E94DF500A70F4C /* WindowController.swift */; }; E47E2FCC2220573500F747E6 /* MediaKeyTap.framework.dSYM in Resources */ = {isa = PBXBuildFile; fileRef = E47E2FCB2220573500F747E6 /* MediaKeyTap.framework.dSYM */; }; E47E2FD122205C4600F747E6 /* MainSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47E2FD022205C4600F747E6 /* MainSplitViewController.swift */; }; @@ -109,6 +115,7 @@ E41B22C121FB6C3300D544F6 /* libmpdclient.2.dylib in Embed Libraries */, E450ADA42229E7E00091BED3 /* PMKFoundation.framework in Embed Libraries */, E421ACA4221F73C4008B2449 /* MediaKeyTap.framework in Embed Libraries */, + E45E4FE222516953004B537F /* CryptoSwift.framework in Embed Libraries */, E450AD8822262AEC0091BED3 /* SwiftyJSON.framework in Embed Libraries */, E450AD9322262C970091BED3 /* PromiseKit.framework in Embed Libraries */, ); @@ -211,11 +218,15 @@ E450AD9422262DF10091BED3 /* AlbumArtQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumArtQueue.swift; sourceTree = ""; }; E450AD96222633920091BED3 /* Alamofire.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Alamofire.framework.dSYM; path = Carthage/Build/Mac/Alamofire.framework.dSYM; sourceTree = ""; }; E450AD97222633920091BED3 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/Mac/Alamofire.framework; sourceTree = ""; }; - E450AD9C2229B9050091BED3 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; E450AD9E2229B9BC0091BED3 /* PersephoneBridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PersephoneBridgingHeader.h; sourceTree = ""; }; E450AD9F2229E7C90091BED3 /* PMKFoundation.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = PMKFoundation.framework.dSYM; path = Carthage/Build/Mac/PMKFoundation.framework.dSYM; sourceTree = ""; }; E450ADA02229E7C90091BED3 /* PMKFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PMKFoundation.framework; path = Carthage/Build/Mac/PMKFoundation.framework; sourceTree = ""; }; E45962C52241A78500FC1A1E /* MPDCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPDCommand.swift; sourceTree = ""; }; + E45E4FD722515D87004B537F /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = SOURCE_ROOT; }; + E45E4FD822515D87004B537F /* Brewfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Brewfile; sourceTree = SOURCE_ROOT; }; + E45E4FD922515D87004B537F /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = SOURCE_ROOT; }; + E45E4FDD225168DA004B537F /* CryptoSwift.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = CryptoSwift.framework.dSYM; path = Carthage/Build/Mac/CryptoSwift.framework.dSYM; sourceTree = ""; }; + E45E4FDE225168DA004B537F /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = Carthage/Build/Mac/CryptoSwift.framework; sourceTree = ""; }; E465049921E94DF500A70F4C /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = ""; }; E47E2FCB2220573500F747E6 /* MediaKeyTap.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = MediaKeyTap.framework.dSYM; path = Carthage/Build/Mac/MediaKeyTap.framework.dSYM; sourceTree = ""; }; E47E2FD022205C4600F747E6 /* MainSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSplitViewController.swift; sourceTree = ""; }; @@ -247,9 +258,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E45E4FE122516953004B537F /* CryptoSwift.framework in Frameworks */, E41B22C021FB6BBA00D544F6 /* libmpdclient.2.dylib in Frameworks */, E421ACA3221F73C4008B2449 /* MediaKeyTap.framework in Frameworks */, E450AD8622262AE60091BED3 /* SwiftyJSON.framework in Frameworks */, + E45E4FE0225168DA004B537F /* CryptoSwift.framework in Frameworks */, E450ADA32229E7E00091BED3 /* PMKFoundation.framework in Frameworks */, E450AD9222262C970091BED3 /* PromiseKit.framework in Frameworks */, ); @@ -275,11 +288,14 @@ E407860F2110CE6E006887B1 = { isa = PBXGroup; children = ( + E41B22BE21FB6B3300D544F6 /* Frameworks */, E407861A2110CE6E006887B1 /* Persephone */, E407862D2110CE70006887B1 /* PersephoneTests */, E40786382110CE70006887B1 /* PersephoneUITests */, E40786192110CE6E006887B1 /* Products */, - E41B22BE21FB6B3300D544F6 /* Frameworks */, + E45E4FD822515D87004B537F /* Brewfile */, + E45E4FD922515D87004B537F /* Cartfile */, + E45E4FD722515D87004B537F /* CHANGELOG.md */, E42A8F3922176D6400A13ED9 /* LICENSE.md */, E42A8F3A22176D6400A13ED9 /* README.md */, ); @@ -346,7 +362,6 @@ E435E3E1221CD4E200184CFC /* NSFont.swift */, E435E3E3221CD75D00184CFC /* NSImage.swift */, E408D3B8220DE98F0006D9BE /* NSUserInterfaceItemIdentifier.swift */, - E450AD9C2229B9050091BED3 /* String.swift */, ); path = Extensions; sourceTree = ""; @@ -380,6 +395,8 @@ E41B22BE21FB6B3300D544F6 /* Frameworks */ = { isa = PBXGroup; children = ( + E45E4FDE225168DA004B537F /* CryptoSwift.framework */, + E45E4FDD225168DA004B537F /* CryptoSwift.framework.dSYM */, E450ADA02229E7C90091BED3 /* PMKFoundation.framework */, E450AD9F2229E7C90091BED3 /* PMKFoundation.framework.dSYM */, E450AD97222633920091BED3 /* Alamofire.framework */, @@ -690,10 +707,14 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E45E4FDB22515D87004B537F /* Brewfile in Resources */, E450AD9122262C780091BED3 /* SwiftyJSON.framework.dSYM in Resources */, E42A8F3B22176D6400A13ED9 /* LICENSE.md in Resources */, + E45E4FDA22515D87004B537F /* CHANGELOG.md in Resources */, + E45E4FDC22515D87004B537F /* Cartfile in Resources */, E450AD98222633920091BED3 /* Alamofire.framework.dSYM in Resources */, E40786202110CE70006887B1 /* Assets.xcassets in Resources */, + E45E4FDF225168DA004B537F /* CryptoSwift.framework.dSYM in Resources */, E42A8F3C22176D6400A13ED9 /* README.md in Resources */, E450AD8F22262C620091BED3 /* PromiseKit.framework.dSYM in Resources */, E408D3CB220E341D0006D9BE /* AlbumViewItem.xib in Resources */, @@ -790,7 +811,6 @@ E41E5312223EF74A00173814 /* AlbumArtService+Filesystem.swift in Sources */, E41E5301223BF99300173814 /* MPDClient+Queue.swift in Sources */, E4EB237B220F7CF1008C70C0 /* MPDAlbum.swift in Sources */, - E450AD9D2229B9050091BED3 /* String.swift in Sources */, E41E5303223BF9C300173814 /* MPDClient+Idle.swift in Sources */, E435E3E4221CD75D00184CFC /* NSImage.swift in Sources */, E41E5305223BFB0700173814 /* MPDClient+Error.swift in Sources */, diff --git a/Persephone/Models/Album.swift b/Persephone/Models/Album.swift index d180b60..881a2bc 100644 --- a/Persephone/Models/Album.swift +++ b/Persephone/Models/Album.swift @@ -7,10 +7,16 @@ // import Cocoa +import CryptoSwift struct Album { var mpdAlbum: MPDClient.MPDAlbum var coverArt: NSImage? + var coverArtFetched: Bool = false + + init(mpdAlbum: MPDClient.MPDAlbum) { + self.mpdAlbum = mpdAlbum + } var title: String { return mpdAlbum.title