From bb0aa480abf325b91c6dc6b423df01670d32f16e Mon Sep 17 00:00:00 2001 From: Jeroen Wesbeek Date: Mon, 10 Apr 2017 11:50:03 +0200 Subject: [PATCH] Fixed warnings --- NPOKit/NPOKit/NPOEpisode.swift | 1 - NPOKit/NPOKit/NPOManager+Episodes.swift | 2 +- NPOKit/NPOKit/NPOManager+GitHubReleases.swift | 1 - NPOKit/NPOKit/NPOManager+Token.swift | 1 - NPOKit/NPOKit/NPOProgram.swift | 2 +- README.md | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/NPOKit/NPOKit/NPOEpisode.swift b/NPOKit/NPOKit/NPOEpisode.swift index 7a4cf8f..1fbf87a 100644 --- a/NPOKit/NPOKit/NPOEpisode.swift +++ b/NPOKit/NPOKit/NPOEpisode.swift @@ -56,7 +56,6 @@ open class NPOEpisode: NPORestrictedMedia { open var subtitleURL: URL? { guard let mid = mid else { return nil } - let transport = NPOManager.sharedInstance.transport return URL(string: "https://tt888.omroep.nl/tt888/\(mid)") } diff --git a/NPOKit/NPOKit/NPOManager+Episodes.swift b/NPOKit/NPOKit/NPOManager+Episodes.swift index 9f6a73c..b249c68 100644 --- a/NPOKit/NPOKit/NPOManager+Episodes.swift +++ b/NPOKit/NPOKit/NPOManager+Episodes.swift @@ -68,7 +68,7 @@ extension NPOManager { // https://apps-api.uitzendinggemist.nl/episodes/search/reizen.json public func getEpisodes(bySearchTerm term: String, withCompletion completed: @escaping (_ episodes: [NPOEpisode]?, _ error: NPOError?) -> Void = { episodes, error in }) -> Request? { let encodedTerm = term.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) - let path = "episodes/search/\(encodedTerm).json" + let path = "episodes/search/\(String(describing: encodedTerm)).json" return self.fetchModels(ofType: NPOEpisode.self, fromPath: path, withCompletion: completed) } diff --git a/NPOKit/NPOKit/NPOManager+GitHubReleases.swift b/NPOKit/NPOKit/NPOManager+GitHubReleases.swift index bf971b6..7f18bd7 100644 --- a/NPOKit/NPOKit/NPOManager+GitHubReleases.swift +++ b/NPOKit/NPOKit/NPOManager+GitHubReleases.swift @@ -12,7 +12,6 @@ import Alamofire extension NPOManager { // https://api.github.com/repos/:user/:repo/releases public func getGitHubReleases(forUsername username: String, andRepositoryName repository: String, withCompletion completed: @escaping (_ releases: [GitHubRelease]?, _ error: NPOError?) -> Void = { releases, error in }) { - let transport = NPOManager.sharedInstance.transport let url = "https://api.github.com/repos/\(username)/\(repository)/releases" _ = self.fetchModels(ofType: GitHubRelease.self, fromURL: url, withKeyPath: nil, withCompletion: completed) } diff --git a/NPOKit/NPOKit/NPOManager+Token.swift b/NPOKit/NPOKit/NPOManager+Token.swift index d6e93da..aff2f80 100644 --- a/NPOKit/NPOKit/NPOManager+Token.swift +++ b/NPOKit/NPOKit/NPOManager+Token.swift @@ -20,7 +20,6 @@ extension NPOManager { } // refresh token - let transport = NPOManager.sharedInstance.transport let url = "https://ida.omroep.nl/app.php/auth" _ = fetchModel(ofType: NPOToken.self, fromURL: url) { [weak self] token, error in //DDLogDebug("Refreshed token: \(token)") diff --git a/NPOKit/NPOKit/NPOProgram.swift b/NPOKit/NPOKit/NPOProgram.swift index 2571ad7..bbd791a 100644 --- a/NPOKit/NPOKit/NPOProgram.swift +++ b/NPOKit/NPOKit/NPOProgram.swift @@ -243,7 +243,7 @@ open class NPOProgram: NPORestrictedMedia { // fetch the episodes for this program _ = NPOManager.sharedInstance.getEpisodes(forProgram: self) { episodes, error in guard let episodes = episodes else { - DDLogError("Could not fetch episodes for program (\(error))") + DDLogError("Could not fetch episodes for program (\(String(describing: error)))") return } diff --git a/README.md b/README.md index 8e12025..f6434ed 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ using a web app hosted on a remote server. # Features - Fast *_native_* app for Apple TV -- Confirmed to work abroad via [Unlocator](https://unlocator.com/account/aff/go/fMJQHpiASKffCbxepcEY?keyword=readme) +- Confirmed to work abroad via [Unlocator](https://unlocator.com/account/aff/go/fMJQHpiASKffCbxepcEY?keyword=readme) (_disable_ the secure transport setting in the configuration view) - Easy to use interface for browsing Programs and Episodes - Live streaming TV and themed channels - The possibility to (un)favorite programs