Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A small refactoring #235

Merged
merged 3 commits into from
Oct 20, 2020
Merged

A small refactoring #235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9eb658f
Update MediaManager.swift
RomanPodymov Oct 17, 2020
7ccf9bf
Update DEV-Simple/core/MediaManager.swift
RomanPodymov Oct 17, 2020
7c92d20
Update MediaManager.swift
RomanPodymov Oct 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions DEV-Simple/core/MediaManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class MediaManager: NSObject {
var podcastImageUrl: String?
var podcastImageFetched: Bool = false

private let seekInterval = 15.0

init(webView: WKWebView, devToURL: String) {
self.webView = webView
self.devToURL = devToURL
Expand Down Expand Up @@ -64,16 +66,18 @@ class MediaManager: NSObject {
// MARK: - Action Functions

private func play(audioUrl: String?, at seconds: String?) {
var seconds = Double(seconds ?? "0")
let secondsDouble: Double?
if currentPodcastURL != audioUrl && audioUrl != nil {
avPlayer?.pause()
seconds = 0
secondsDouble = 0
currentPodcastURL = nil
load(audioUrl: audioUrl)
} else {
secondsDouble = Double(seconds ?? "0")
}

guard avPlayer?.timeControlStatus != .playing else { return }
avPlayer?.seek(to: CMTime(seconds: seconds ?? 0, preferredTimescale: CMTimeScale(NSEC_PER_SEC)))
avPlayer?.seek(to: CMTime(seconds: secondsDouble ?? 0, preferredTimescale: CMTimeScale(NSEC_PER_SEC)))
avPlayer?.play()
avPlayer?.rate = podcastRate ?? 1
updateNowPlayingInfoCenter()
Expand All @@ -90,19 +94,16 @@ class MediaManager: NSObject {
return
}
let playerCurrentTime = CMTimeGetSeconds(avPlayer!.currentTime())
let newTime = playerCurrentTime + 15
let newTime = playerCurrentTime + seekInterval

if newTime < (CMTimeGetSeconds(duration) - 15) {
if newTime < (CMTimeGetSeconds(duration) - seekInterval) {
avPlayer!.seek(to: seekableTime(newTime), toleranceBefore: CMTime.zero, toleranceAfter: CMTime.zero)
}
}

private func seekBackward(_ sender: Any) {
let playerCurrentTime = CMTimeGetSeconds(avPlayer!.currentTime())
var newTime = playerCurrentTime - 15
if newTime < 0 {
newTime = 0
}
let newTime = max(0, playerCurrentTime - seekInterval)
avPlayer!.seek(to: seekableTime(newTime), toleranceBefore: CMTime.zero, toleranceAfter: CMTime.zero)
}

Expand Down Expand Up @@ -134,11 +135,11 @@ class MediaManager: NSObject {
}

private func load(audioUrl: String?) {
guard currentPodcastURL == nil && audioUrl != nil else { return }
guard let url = NSURL(string: audioUrl!) else { return }
guard currentPodcastURL == nil, let audioUrl = audioUrl else { return }
guard let url = URL(string: audioUrl) else { return }
currentPodcastURL = audioUrl
currentPodcast = AVPlayerItem.init(url: url as URL)
avPlayer = AVPlayer.init(playerItem: currentPodcast)
currentPodcast = .init(url: url)
avPlayer = .init(playerItem: currentPodcast)
avPlayer?.volume = 1.0
updateTimeLabel(currentTime: 0, duration: 0)

Expand Down Expand Up @@ -174,8 +175,8 @@ class MediaManager: NSObject {
let commandCenter = MPRemoteCommandCenter.shared()
commandCenter.skipForwardCommand.isEnabled = true
commandCenter.skipBackwardCommand.isEnabled = true
commandCenter.skipForwardCommand.preferredIntervals = [15]
commandCenter.skipBackwardCommand.preferredIntervals = [15]
commandCenter.skipForwardCommand.preferredIntervals = [.init(value: seekInterval)]
commandCenter.skipBackwardCommand.preferredIntervals = [.init(value: seekInterval)]
commandCenter.playCommand.addTarget { _ in
let currentTime = String(self.avPlayer?.currentTime().seconds ?? 0)
self.play(audioUrl: self.currentPodcastURL, at: currentTime)
Expand All @@ -187,11 +188,11 @@ class MediaManager: NSObject {
return .success
}
commandCenter.skipForwardCommand.addTarget { _ in
self.seekForward(15)
self.seekForward(self.seekInterval)
return .success
}
commandCenter.skipBackwardCommand.addTarget { _ in
self.seekBackward(15)
self.seekBackward(self.seekInterval)
return .success
}
}
Expand Down