react-native-audio-browser 0.2.0-next.52 → 0.2.0-next.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +35 -49
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +16 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +26 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +15 -11
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +112 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/package.json +1 -1
|
@@ -2,10 +2,6 @@ import Testing
|
|
|
2
2
|
|
|
3
3
|
@testable import AudioBrowserTestable
|
|
4
4
|
|
|
5
|
-
// The (resolved style, platform capability) → rendered-form mapping (ADR
|
|
6
|
-
// 0011): degradation drops decorations before layout, and the one layout drop
|
|
7
|
-
// is a wrapping grid on a platform without a wrapping tile container.
|
|
8
|
-
|
|
9
5
|
@Suite("SectionPresentation")
|
|
10
6
|
struct SectionPresentationTests {
|
|
11
7
|
private func style(display: StyleDisplay?, gridWrap: Bool? = nil) -> SectionStyle {
|
|
@@ -24,14 +20,10 @@ struct SectionPresentationTests {
|
|
|
24
20
|
@Test func wrappingGridNeedsTheWrappingContainer() {
|
|
25
21
|
#expect(
|
|
26
22
|
SectionPresentation(for: style(display: .grid), supportsWrappingGrid: true) == .wrappingGrid)
|
|
27
|
-
// The one layout drop: a wrapping grid has nowhere to go but a list —
|
|
28
|
-
// every item stays reachable instead of truncating at an unknowable width.
|
|
29
23
|
#expect(SectionPresentation(for: style(display: .grid), supportsWrappingGrid: false) == .list)
|
|
30
24
|
}
|
|
31
25
|
|
|
32
26
|
@Test func singleLineGridRendersOnEveryOS() {
|
|
33
|
-
// gridWrap: false is the legacy image row's own shape, so it never
|
|
34
|
-
// degrades — declaring it INCREASES pre-26 fidelity.
|
|
35
27
|
#expect(
|
|
36
28
|
SectionPresentation(for: style(display: .grid, gridWrap: false), supportsWrappingGrid: true)
|
|
37
29
|
== .singleLineRow)
|
|
@@ -50,7 +42,6 @@ struct SectionPresentationTests {
|
|
|
50
42
|
}
|
|
51
43
|
|
|
52
44
|
@Test func gridWrapIsInertOnLists() {
|
|
53
|
-
// Declaring a decoration never changes the layout you'd get without it.
|
|
54
45
|
#expect(
|
|
55
46
|
SectionPresentation(for: style(display: .list, gridWrap: false), supportsWrappingGrid: true)
|
|
56
47
|
== .list)
|
|
@@ -60,8 +51,6 @@ struct SectionPresentationTests {
|
|
|
60
51
|
}
|
|
61
52
|
|
|
62
53
|
@Test func tileFamilyFollowsGridTile() {
|
|
63
|
-
// The family follows the declaration alone; the wrap mode only decides
|
|
64
|
-
// whether its elements take more than one line.
|
|
65
54
|
#expect(SectionPresentation.tileFamily(for: SectionStyle(gridTile: .card)) == .cardElements)
|
|
66
55
|
#expect(
|
|
67
56
|
SectionPresentation.tileFamily(for: SectionStyle(gridTile: .image)) == .imageGridElements)
|
|
@@ -75,18 +64,16 @@ struct SectionPresentationTests {
|
|
|
75
64
|
let viewAll = Section(title: "Popular", path: "/popular", children: [])
|
|
76
65
|
let preview = Section(title: "Popular", children: [])
|
|
77
66
|
let untitled = Section(children: [])
|
|
78
|
-
//
|
|
79
|
-
// shelf that has somewhere to go.
|
|
67
|
+
// CarPlay draws a chevron beside the image row's text, so a shelf with a path titles it there.
|
|
80
68
|
#expect(SectionPresentation.tileSectionHeader(viewAll, supportsElements: true) == nil)
|
|
81
69
|
#expect(SectionPresentation.tileSectionHeader(preview, supportsElements: true) == "Popular")
|
|
82
70
|
#expect(SectionPresentation.tileSectionHeader(untitled, supportsElements: true) == nil)
|
|
83
|
-
//
|
|
71
|
+
// Before the iOS 26 element API, the legacy image row's text always carries the title.
|
|
84
72
|
#expect(SectionPresentation.tileSectionHeader(preview, supportsElements: false) == nil)
|
|
85
73
|
}
|
|
86
74
|
|
|
87
75
|
@Test func effectiveAccessorySymbol_noneAndAbsenceDrawNothing() {
|
|
88
|
-
//
|
|
89
|
-
// both fall back to the derived accessory.
|
|
76
|
+
// nil draws the derived accessory (a browsable row's chevron), not no accessory.
|
|
90
77
|
#expect(
|
|
91
78
|
SectionPresentation.effectiveAccessorySymbol(TrackStyle(accessorySymbol: "lock.fill"))
|
|
92
79
|
== "lock.fill")
|
|
@@ -14,9 +14,6 @@ struct SectionScopeTests {
|
|
|
14
14
|
scoped.map { $0.section.children.map(\.src) }
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
// Two sections sharing an identity — the duplicate-heavy shape the flat
|
|
18
|
-
// model had to disambiguate by precedence; sections + the stamped flat
|
|
19
|
-
// index make it exact.
|
|
20
17
|
private var sections: [Section] {
|
|
21
18
|
[
|
|
22
19
|
section("First", [track("dup"), track("x")]),
|
|
@@ -31,7 +28,7 @@ struct SectionScopeTests {
|
|
|
31
28
|
}
|
|
32
29
|
|
|
33
30
|
@Test func flatIndexPinsTheTappedSection() {
|
|
34
|
-
// Flat index 3
|
|
31
|
+
// Flat index 3 is the second section's offset 1.
|
|
35
32
|
let scoped = SectionScope.scoped(in: sections, containing: "dup", tappedIndex: 3)
|
|
36
33
|
#expect(srcs(scoped) == ["y", "dup", "z"])
|
|
37
34
|
#expect(scoped?.tappedOffset == 1)
|
|
@@ -44,8 +41,7 @@ struct SectionScopeTests {
|
|
|
44
41
|
}
|
|
45
42
|
|
|
46
43
|
@Test func staleIndexFallsBackToTheFirstIdentityMatch() {
|
|
47
|
-
//
|
|
48
|
-
// (the list shifted) — resolution ignores the index and pins nothing.
|
|
44
|
+
// Flat index 1 holds "x", not "dup".
|
|
49
45
|
let scoped = SectionScope.scoped(in: sections, containing: "dup", tappedIndex: 1)
|
|
50
46
|
#expect(srcs(scoped) == ["dup", "x"])
|
|
51
47
|
#expect(scoped?.tappedOffset == nil)
|
|
@@ -123,6 +119,7 @@ struct SectionScopeTests {
|
|
|
123
119
|
section("First", [track("a"), Track(id: "off", src: "off", disabled: true), Track(path: "/browse"), track("b")]),
|
|
124
120
|
section("Second", [track("c")]),
|
|
125
121
|
]
|
|
122
|
+
// The flat index counts the unplayable children too.
|
|
126
123
|
let result = queue(page, "/p?__trackId=b&__index=3")
|
|
127
124
|
#expect(result?.0 == ["a", "b"])
|
|
128
125
|
#expect(result?.1 == 1)
|
|
@@ -122,16 +122,12 @@ private func match(_ path: String, _ patterns: [String]) -> (route: TestRoute, m
|
|
|
122
122
|
}
|
|
123
123
|
|
|
124
124
|
@Test func computesCorrectSpecificityForTailWildcardPatterns() {
|
|
125
|
-
// Regression test for issue #27: specificity must account for
|
|
126
|
-
// segment types before the ** wildcard.
|
|
127
125
|
let result = match("/api/v1/users", ["/api/v1/**"])
|
|
128
|
-
// constant
|
|
126
|
+
// 1000 per constant × 2 + 1 per segment before the tail × 2 + 2 for the tail wildcard
|
|
129
127
|
#expect(result!.match.specificity == 2004)
|
|
130
128
|
}
|
|
131
129
|
|
|
132
130
|
@Test func prefersConstantPrefixOverParameterPrefixInTailWildcards() {
|
|
133
|
-
// Second part of issue #27: with correct specificity, the constant
|
|
134
|
-
// prefix should beat the parameter prefix.
|
|
135
131
|
let result = match("/api/v1/users", ["/api/{version}/**", "/api/v1/**"])
|
|
136
132
|
#expect(result!.route.path == "/api/v1/**")
|
|
137
133
|
}
|
|
@@ -2,9 +2,6 @@
|
|
|
2
2
|
import Foundation
|
|
3
3
|
import Testing
|
|
4
4
|
|
|
5
|
-
// Timing tests drive a ManualSleepTimerScheduler rather than the main queue:
|
|
6
|
-
// every deadline below is virtual, so nothing races the real clock.
|
|
7
|
-
|
|
8
5
|
@MainActor
|
|
9
6
|
private final class Volume {
|
|
10
7
|
var level: Float = 0.8
|
|
@@ -31,7 +28,7 @@ struct SleepTimerManagerTests {
|
|
|
31
28
|
}
|
|
32
29
|
manager.set(seconds: 0.3, fadeDuration: 0.15)
|
|
33
30
|
|
|
34
|
-
clock.advance(to: 0.05) // before the fade window
|
|
31
|
+
clock.advance(to: 0.05) // before the fade window opens at 0.15
|
|
35
32
|
#expect(!manager.isFading)
|
|
36
33
|
#expect(manager.get() != nil)
|
|
37
34
|
|
|
@@ -40,9 +37,9 @@ struct SleepTimerManagerTests {
|
|
|
40
37
|
#expect(fader.duration == 0.15)
|
|
41
38
|
#expect(fader.originalVolume == 0.8)
|
|
42
39
|
#expect(completes == 0)
|
|
43
|
-
volume.level = 0.1 //
|
|
40
|
+
volume.level = 0.1 // stands in for the fade lowering it
|
|
44
41
|
|
|
45
|
-
clock.advance(to: 0.4)
|
|
42
|
+
clock.advance(to: 0.4)
|
|
46
43
|
#expect(completes == 1)
|
|
47
44
|
#expect(volumeAtHalt == 0.1) // halted before the restore
|
|
48
45
|
#expect(volume.level == 0.8)
|
|
@@ -56,7 +53,7 @@ struct SleepTimerManagerTests {
|
|
|
56
53
|
|
|
57
54
|
manager.set(seconds: 0.2, fadeDuration: 5)
|
|
58
55
|
|
|
59
|
-
clock.advance(to: 0.1)
|
|
56
|
+
clock.advance(to: 0.1)
|
|
60
57
|
#expect(manager.isFading)
|
|
61
58
|
#expect(fader.duration == 0.2)
|
|
62
59
|
}
|
|
@@ -66,13 +63,13 @@ struct SleepTimerManagerTests {
|
|
|
66
63
|
let (manager, clock, volume, _) = makeManager()
|
|
67
64
|
manager.set(seconds: 0.2, fadeDuration: 0.15)
|
|
68
65
|
clock.advance(to: 0.1)
|
|
69
|
-
volume.level = 0.1 //
|
|
66
|
+
volume.level = 0.1 // stands in for the fade lowering it
|
|
70
67
|
|
|
71
68
|
#expect(manager.clear())
|
|
72
69
|
#expect(volume.level == 0.8)
|
|
73
70
|
#expect(!manager.isFading)
|
|
74
71
|
|
|
75
|
-
clock.advance(to: 0.3)
|
|
72
|
+
clock.advance(to: 0.3)
|
|
76
73
|
#expect(!manager.isFading)
|
|
77
74
|
}
|
|
78
75
|
|
|
@@ -92,7 +89,7 @@ struct SleepTimerManagerTests {
|
|
|
92
89
|
let (manager, clock, volume, _) = makeManager()
|
|
93
90
|
manager.set(seconds: 60, fadeDuration: 10)
|
|
94
91
|
clock.advance(to: 55)
|
|
95
|
-
volume.level = 0.1 //
|
|
92
|
+
volume.level = 0.1 // stands in for the fade lowering it
|
|
96
93
|
|
|
97
94
|
manager.set(seconds: 30)
|
|
98
95
|
|
|
@@ -105,7 +102,7 @@ struct SleepTimerManagerTests {
|
|
|
105
102
|
let (manager, clock, volume, _) = makeManager()
|
|
106
103
|
manager.set(seconds: 60, fadeDuration: 10)
|
|
107
104
|
clock.advance(to: 55)
|
|
108
|
-
volume.level = 0.1 //
|
|
105
|
+
volume.level = 0.1 // stands in for the fade lowering it
|
|
109
106
|
|
|
110
107
|
manager.setToEndOfTrack()
|
|
111
108
|
|
|
@@ -2,10 +2,7 @@ import Testing
|
|
|
2
2
|
|
|
3
3
|
@testable import AudioBrowserTestable
|
|
4
4
|
|
|
5
|
-
// Resolution
|
|
6
|
-
// by scope override (`section ?? page`), inherited item properties resolve
|
|
7
|
-
// `track ?? section ?? page` — and `display` never inherits onto an item.
|
|
8
|
-
|
|
5
|
+
// Resolution rules: docs/adr/0011-style-is-a-declaration-block.md
|
|
9
6
|
@Suite("StyleResolver.sectionStyle")
|
|
10
7
|
struct SectionStyleResolutionTests {
|
|
11
8
|
@Test func sectionOverridesThePagePerProperty() {
|
|
@@ -13,7 +10,6 @@ struct SectionStyleResolutionTests {
|
|
|
13
10
|
section: SectionStyle(gridWrap: nil, display: .list, artworkRendering: nil),
|
|
14
11
|
page: SectionStyle(gridWrap: false, display: .grid, artworkRendering: .stencil),
|
|
15
12
|
)
|
|
16
|
-
// Declared on the section: wins. Undeclared: the page's scope-wide value.
|
|
17
13
|
#expect(resolved.display == .list)
|
|
18
14
|
#expect(resolved.artworkRendering == .stencil)
|
|
19
15
|
#expect(resolved.gridWrap == false)
|
|
@@ -37,7 +33,6 @@ struct SectionStyleResolutionTests {
|
|
|
37
33
|
}
|
|
38
34
|
|
|
39
35
|
@Test func gridTileResolvesByScopeOverride() {
|
|
40
|
-
// A page-wide card treatment; one section opts back to plain tiles.
|
|
41
36
|
let inherited = StyleResolver.sectionStyle(
|
|
42
37
|
section: nil,
|
|
43
38
|
page: SectionStyle(gridTile: .card),
|
|
@@ -75,9 +70,8 @@ struct TrackStyleResolutionTests {
|
|
|
75
70
|
}
|
|
76
71
|
|
|
77
72
|
@Test func displayNeverInheritsOntoAnItem() {
|
|
78
|
-
// The track's own `display` is the
|
|
79
|
-
//
|
|
80
|
-
// the item's resolved display.
|
|
73
|
+
// The track's own `display` is the layout of the page it opens, not of the
|
|
74
|
+
// row it sits in; neither it nor the section's may resolve onto the item.
|
|
81
75
|
let resolved = StyleResolver.trackStyle(
|
|
82
76
|
track: TrackStyle(display: .grid, artworkRendering: nil),
|
|
83
77
|
section: SectionStyle(gridWrap: nil, display: .grid, artworkRendering: nil),
|
|
@@ -86,7 +80,6 @@ struct TrackStyleResolutionTests {
|
|
|
86
80
|
}
|
|
87
81
|
|
|
88
82
|
@Test func imageShapeInheritsAndOverridesPerItem() {
|
|
89
|
-
// Section-wide circular (an artists shelf); one album overrides.
|
|
90
83
|
let inherited = StyleResolver.trackStyle(
|
|
91
84
|
track: nil,
|
|
92
85
|
section: SectionStyle(imageShape: .circular),
|
|
@@ -105,8 +98,7 @@ struct TrackStyleResolutionTests {
|
|
|
105
98
|
section: SectionStyle(accessorySymbol: "lock.fill"),
|
|
106
99
|
)
|
|
107
100
|
#expect(inherited.accessorySymbol == "lock.fill")
|
|
108
|
-
//
|
|
109
|
-
// (the renderer, not the resolver, maps it to "no accessory").
|
|
101
|
+
// "none" stays a value here: the renderer, not the resolver, maps it to no accessory.
|
|
110
102
|
let escaped = StyleResolver.trackStyle(
|
|
111
103
|
track: TrackStyle(accessorySymbol: "none"),
|
|
112
104
|
section: SectionStyle(accessorySymbol: "lock.fill"),
|
|
@@ -115,7 +107,6 @@ struct TrackStyleResolutionTests {
|
|
|
115
107
|
}
|
|
116
108
|
|
|
117
109
|
@Test func cardPropertiesInheritAndOverridePerItem() {
|
|
118
|
-
// Section-wide tint/mode; one card overrides its image mode.
|
|
119
110
|
let inherited = StyleResolver.trackStyle(
|
|
120
111
|
track: nil,
|
|
121
112
|
section: SectionStyle(accessorySymbol: nil, cardTint: "#1e3a8a", cardImage: .background),
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
@testable import AudioBrowserTestable
|
|
2
2
|
import Foundation
|
|
3
3
|
|
|
4
|
-
/// A job handed back by `ManualSleepTimerScheduler`.
|
|
5
4
|
private final class ManualJob: SleepTimerJob {
|
|
6
5
|
nonisolated(unsafe) var isCancelled = false
|
|
7
6
|
func cancel() { isCancelled = true }
|
|
8
7
|
}
|
|
9
8
|
|
|
10
|
-
///
|
|
11
|
-
/// test advances the clock, so an assertion can never lose a race against a
|
|
12
|
-
/// real deadline on a loaded CI runner.
|
|
9
|
+
/// Fires jobs only when the test calls `advance(to:)`, so no assertion races a real deadline.
|
|
13
10
|
@MainActor
|
|
14
11
|
final class ManualSleepTimerScheduler: SleepTimerScheduling {
|
|
15
12
|
private struct Entry {
|
|
@@ -30,10 +27,8 @@ final class ManualSleepTimerScheduler: SleepTimerScheduling {
|
|
|
30
27
|
return job
|
|
31
28
|
}
|
|
32
29
|
|
|
33
|
-
/// Moves the
|
|
34
|
-
///
|
|
35
|
-
/// fade landing before completion) sees the same ordering it would in
|
|
36
|
-
/// production.
|
|
30
|
+
/// Moves the clock to `time` and runs each due job one at a time in deadline order, so a job
|
|
31
|
+
/// that schedules or cancels another sees the same ordering it would in production.
|
|
37
32
|
func advance(to time: TimeInterval) {
|
|
38
33
|
now = time
|
|
39
34
|
while let next = entries
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
@testable import AudioBrowserTestable
|
|
2
2
|
import AVFoundation
|
|
3
3
|
|
|
4
|
-
/// Creates an AVMetadataItem with the specified properties for testing.
|
|
5
4
|
func makeMetadataItem(
|
|
6
5
|
identifier: AVMetadataIdentifier? = nil,
|
|
7
6
|
commonKey: AVMetadataKey? = nil,
|
|
@@ -31,12 +30,10 @@ func makeMetadataItem(
|
|
|
31
30
|
final class MockPlayerEngine: PlayerEngine {
|
|
32
31
|
var onEvent: (@MainActor (EngineEvent) -> Void)?
|
|
33
32
|
|
|
34
|
-
/// Reports `event` as the media stack would.
|
|
35
33
|
func emit(_ event: EngineEvent) {
|
|
36
34
|
onEvent?(event)
|
|
37
35
|
}
|
|
38
36
|
|
|
39
|
-
// The current item
|
|
40
37
|
var hasItem = false
|
|
41
38
|
var hasLoadedAsset = false
|
|
42
39
|
var currentTime: Double = 0
|
|
@@ -48,7 +45,6 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
48
45
|
var isAirPlayRoute = false
|
|
49
46
|
var volume: Float = 1
|
|
50
47
|
|
|
51
|
-
// Loading
|
|
52
48
|
var resolveAndLoadCalls: [String] = []
|
|
53
49
|
var cancelLoadingCount = 0
|
|
54
50
|
var dropAssetCount = 0
|
|
@@ -63,7 +59,6 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
63
59
|
func stopObservingItem() { stopObservingItemCount += 1 }
|
|
64
60
|
func recreate() { recreateCount += 1 }
|
|
65
61
|
|
|
66
|
-
// Transport
|
|
67
62
|
var startPlaybackCallCount = 0
|
|
68
63
|
var pausePlaybackCallCount = 0
|
|
69
64
|
var setTimePitchCallCount = 0
|
|
@@ -82,7 +77,6 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
82
77
|
if let seekResult { completion(seekResult) } else { seeksInFlight.append(completion) }
|
|
83
78
|
}
|
|
84
79
|
|
|
85
|
-
/// Lands the seeks left in flight while `seekResult` was nil.
|
|
86
80
|
func completeSeeks(_ finished: Bool) {
|
|
87
81
|
let pending = seeksInFlight
|
|
88
82
|
seeksInFlight = []
|
|
@@ -93,7 +87,6 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
93
87
|
|
|
94
88
|
func applyTimePitchAlgorithm() { setTimePitchCallCount += 1 }
|
|
95
89
|
|
|
96
|
-
// Now playing and remote commands
|
|
97
90
|
var primeCount = 0
|
|
98
91
|
var loadNowPlayingMetadataCalls: [Track] = []
|
|
99
92
|
var clearNowPlayingCallCount = 0
|
|
@@ -110,14 +103,13 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
110
103
|
updateSkipAvailabilityCalls.append((canNext, canPrevious))
|
|
111
104
|
}
|
|
112
105
|
|
|
113
|
-
// Now-playing lines and the audio session, in the order the Player drove them
|
|
114
106
|
var nowPlayingRenderCount = 0
|
|
115
107
|
var nowPlayingTrackChangedCount = 0
|
|
116
108
|
var appliedTimedMetadata: [TimedMetadata] = []
|
|
117
109
|
var activateAudioSessionCount = 0
|
|
118
110
|
var cancelAudioSessionReleaseCount = 0
|
|
119
111
|
var scheduleAudioSessionReleaseCount = 0
|
|
120
|
-
/// Called with the name of each
|
|
112
|
+
/// Called with the name of each seam call above, so a test can interleave them with callbacks.
|
|
121
113
|
var onSeamCall: ((String) -> Void)?
|
|
122
114
|
|
|
123
115
|
func renderNowPlaying() {
|
|
@@ -151,8 +143,8 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
151
143
|
}
|
|
152
144
|
}
|
|
153
145
|
|
|
154
|
-
/// A Player
|
|
155
|
-
///
|
|
146
|
+
/// A Player whose retries reload while `retries` and otherwise give up, persisting to a
|
|
147
|
+
/// test-only defaults suite.
|
|
156
148
|
@MainActor
|
|
157
149
|
func makePlayer(
|
|
158
150
|
engine: MockPlayerEngine = MockPlayerEngine(),
|
|
@@ -165,6 +157,7 @@ func makePlayer(
|
|
|
165
157
|
engine: engine, retry: retry, sleepTimerScheduler: sleepTimerScheduler,
|
|
166
158
|
persistenceDefaults: UserDefaults(suiteName: "PlayerTests")!, persistenceSaveInterval: saveInterval,
|
|
167
159
|
)
|
|
160
|
+
// Player's init installs its own `shouldRetry`; replace it afterwards.
|
|
168
161
|
retry.shouldRetry = { retries }
|
|
169
162
|
return player
|
|
170
163
|
}
|
|
@@ -180,7 +173,6 @@ final class MockPlayerCallbacks: PlayerCallbacks {
|
|
|
180
173
|
var playingStateChanges: [PlayingState] = []
|
|
181
174
|
var queueEndedEvents: [PlaybackQueueEndedEvent] = []
|
|
182
175
|
var queueChanges: [[Track]] = []
|
|
183
|
-
/// The order in which the queue and active-track callbacks arrived.
|
|
184
176
|
var queueAndTrackOrder: [String] = []
|
|
185
177
|
var repeatModeChanges: [RepeatModeChangedEvent] = []
|
|
186
178
|
var shuffleEnabledChanges: [Bool] = []
|
|
@@ -188,7 +180,6 @@ final class MockPlayerCallbacks: PlayerCallbacks {
|
|
|
188
180
|
var playbackIntervalFiredCount = 0
|
|
189
181
|
var timedMetadata: [TimedMetadata] = []
|
|
190
182
|
|
|
191
|
-
/// The order playback, intent and playing-state changes arrived in.
|
|
192
183
|
var publishOrder: [String] = []
|
|
193
184
|
|
|
194
185
|
func playerDidChangePlayback(_ playback: Playback) {
|
|
@@ -253,8 +244,7 @@ final class MockPlayerCallbacks: PlayerCallbacks {
|
|
|
253
244
|
|
|
254
245
|
// MARK: - RetryLoop
|
|
255
246
|
|
|
256
|
-
///
|
|
257
|
-
/// while `retries` and otherwise give up, as an exhausted budget does.
|
|
247
|
+
/// An enabled RetryLoop that backs off for `delay` seconds and reloads while `retries`.
|
|
258
248
|
@MainActor
|
|
259
249
|
func makeRetryLoop(retries: Bool = true, delay: TimeInterval = 0) -> RetryLoop {
|
|
260
250
|
let loop = RetryLoop(sleep: { _ in
|
|
@@ -60,8 +60,6 @@ struct TabBarEntriesTests {
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
@Test func nonRenderedFieldChangeIsSame() {
|
|
63
|
-
// Only fields the tab bar renders are compared; other track fields may
|
|
64
|
-
// drift without churning the tab bar.
|
|
65
63
|
#expect(
|
|
66
64
|
TabBarEntries.same(
|
|
67
65
|
[tab("Explore", path: "/explore", artist: "a")],
|
|
@@ -28,7 +28,7 @@ struct TimedMetadataICYTests {
|
|
|
28
28
|
return item
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
// "Песня" as windows-1251 bytes
|
|
31
|
+
// "Песня" as windows-1251 bytes read as Latin-1, as AVFoundation decodes it when it guesses wrong.
|
|
32
32
|
private let latin1Shaped = "\u{CF}\u{E5}\u{F1}\u{ED}\u{FF}"
|
|
33
33
|
|
|
34
34
|
@Test func icyCharset_redecodesLatin1ShapedTitle() {
|
|
@@ -115,11 +115,10 @@ struct TimedMetadataID3Tests {
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
@Test func id3AllEmpty_returnsNil() {
|
|
118
|
-
//
|
|
118
|
+
// An ID3 item, but not one any field is read from.
|
|
119
119
|
let item = makeMetadataItem(identifier: .id3MetadataEncodedBy, value: "encoder")
|
|
120
120
|
|
|
121
121
|
let result = TimedMetadata.from(items: [item])
|
|
122
|
-
// The item has id3 keySpace, so it enters fromId3 which doesn't match .id3MetadataEncodedBy
|
|
123
122
|
#expect(result == nil)
|
|
124
123
|
}
|
|
125
124
|
}
|
|
@@ -9,7 +9,7 @@ private final class Page {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
/// A template stack whose mutations complete only when the test steps them,
|
|
12
|
-
///
|
|
12
|
+
/// as CarPlay's complete on a later run-loop turn.
|
|
13
13
|
@MainActor
|
|
14
14
|
private final class FakeStack: TemplateStack {
|
|
15
15
|
private(set) var templates: [Page]
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
@testable import AudioBrowserTestable
|
|
2
2
|
import Testing
|
|
3
3
|
|
|
4
|
-
/// `{id}`
|
|
5
|
-
///
|
|
6
|
-
/// the token LITERALLY in place — never substitute an empty string, never skip — so the
|
|
7
|
-
/// resulting request 404s with a self-describing URL (the resolver logs a warning keyed off
|
|
8
|
-
/// `containsToken`). Mirrors Android's `substituteTrackId` / `configContainsIdToken`.
|
|
4
|
+
/// Without a non-blank id the `{id}` token stays literal, never blanked or skipped, so the
|
|
5
|
+
/// request fails with a self-describing URL. Android's `substituteTrackId` must match.
|
|
9
6
|
struct TrackIdTemplateTests {
|
|
10
7
|
// MARK: substitution with an id
|
|
11
8
|
|
|
@@ -60,7 +57,6 @@ struct TrackIdTemplateTests {
|
|
|
60
57
|
}
|
|
61
58
|
|
|
62
59
|
@Test func substitutionThenDetectionNeverBothMatch() {
|
|
63
|
-
// With an id, substitution clears the token, so no warning fires.
|
|
64
60
|
let subbed = TrackIdTemplate.substitute("/artwork/{id}", id: "abc")
|
|
65
61
|
#expect(!TrackIdTemplate.containsToken(subbed))
|
|
66
62
|
}
|
|
@@ -50,16 +50,13 @@ struct TrackMetadataCommonIdentifierTests {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
@Test func identifierWinsOverCommonKey() {
|
|
53
|
-
// .quickTimeMetadataTitle
|
|
54
|
-
// but has commonKey .commonKeyTitle — so it only matches the fallback path.
|
|
53
|
+
// .quickTimeMetadataTitle reaches title only through its commonKey fallback.
|
|
55
54
|
let items = [
|
|
56
55
|
makeMetadataItem(identifier: .commonIdentifierTitle, value: "Identifier Title"),
|
|
57
56
|
makeMetadataItem(identifier: .quickTimeMetadataTitle, value: "QuickTime Title"),
|
|
58
57
|
]
|
|
59
58
|
|
|
60
59
|
let metadata = TrackMetadata.from(items: items)
|
|
61
|
-
// The first item sets title via identifier match.
|
|
62
|
-
// The second item falls through to commonKey, which uses title ?? ... (no overwrite).
|
|
63
60
|
#expect(metadata.title == "Identifier Title")
|
|
64
61
|
}
|
|
65
62
|
}
|
|
@@ -10,7 +10,6 @@ private final class BrowserMock: TrackSelectionBrowser {
|
|
|
10
10
|
var expandQueueResult: (tracks: [Track], selectedIndex: Int)?
|
|
11
11
|
var expandQueueError: Error?
|
|
12
12
|
|
|
13
|
-
// Record calls for verification
|
|
14
13
|
var trackLoadEvents: [TrackLoadEvent] = []
|
|
15
14
|
var expandedPaths: [String] = []
|
|
16
15
|
|
|
@@ -126,7 +125,7 @@ struct ContextualPathQueueReuseTests {
|
|
|
126
125
|
let trackSrc = "song.mp3"
|
|
127
126
|
let contextualPath = BrowserPathHelper.build(parentPath: parentPath, trackId: trackSrc)
|
|
128
127
|
|
|
129
|
-
//
|
|
128
|
+
// Queue tracks carry no id, so identity falls back to src.
|
|
130
129
|
player.queueSourcePath = parentPath
|
|
131
130
|
player.tracks = [
|
|
132
131
|
Track(src: "other.mp3"),
|
|
@@ -149,9 +148,6 @@ struct ContextualPathQueueReuseTests {
|
|
|
149
148
|
#expect(browser.expandedPaths.isEmpty)
|
|
150
149
|
}
|
|
151
150
|
|
|
152
|
-
// Skip-in-place matches by id when queue tracks carry ids: the contextual
|
|
153
|
-
// trackId is the row's identity (its id), and the queue row is found even
|
|
154
|
-
// though its src differs textually from the tapped track's.
|
|
155
151
|
@Test func matchingQueueSourcePath_skipsToTrackByIdWhenSrcDiffers() async {
|
|
156
152
|
let (selector, browser, player) = makeSelector()
|
|
157
153
|
let parentPath = "/library/radio"
|
|
@@ -199,9 +195,6 @@ struct ContextualPathQueueReuseTests {
|
|
|
199
195
|
#expect(browser.expandedPaths.isEmpty)
|
|
200
196
|
}
|
|
201
197
|
|
|
202
|
-
// A queue holding the same identity twice (normal for music playlists):
|
|
203
|
-
// exact contextual-path equality — which carries the stamped page index —
|
|
204
|
-
// pins the tapped copy instead of the first one.
|
|
205
198
|
@Test func duplicateIdentityInQueue_pathMatchPinsTheTappedCopy() async {
|
|
206
199
|
let (selector, browser, player) = makeSelector()
|
|
207
200
|
let parentPath = "/playlist"
|
|
@@ -226,10 +219,6 @@ struct ContextualPathQueueReuseTests {
|
|
|
226
219
|
#expect(browser.expandedPaths.isEmpty)
|
|
227
220
|
}
|
|
228
221
|
|
|
229
|
-
// A tap in section B whose identity also sits in the active section-A
|
|
230
|
-
// queue: the exact surface is not in the queue, so the selection
|
|
231
|
-
// re-expands (re-scoping to the tapped section) instead of silently
|
|
232
|
-
// skipping inside the old section's queue.
|
|
233
222
|
@Test func indexStampedPathNotInQueue_reExpandsInsteadOfIdentitySkip() async {
|
|
234
223
|
let (selector, browser, player) = makeSelector()
|
|
235
224
|
let parentPath = "/city"
|
|
@@ -237,6 +226,8 @@ struct ContextualPathQueueReuseTests {
|
|
|
237
226
|
BrowserPathHelper.build(parentPath: parentPath, trackId: id, index: index)
|
|
238
227
|
}
|
|
239
228
|
|
|
229
|
+
// "dup" is in the queue at another stamped index: an identity match would skip to it,
|
|
230
|
+
// but a tap on another surface re-expands to scope the queue to that surface.
|
|
240
231
|
player.queueSourcePath = parentPath
|
|
241
232
|
player.tracks = [
|
|
242
233
|
Track(path: stamped("dup", 0), src: "dup"),
|
|
@@ -371,13 +362,10 @@ struct DisabledTrackTests {
|
|
|
371
362
|
Issue.record("Expected .none for a disabled track, got \(result)")
|
|
372
363
|
return
|
|
373
364
|
}
|
|
374
|
-
// Refused outright: not even the JS load handler hears about it.
|
|
375
365
|
#expect(browser.trackLoadEvents.isEmpty)
|
|
376
366
|
}
|
|
377
367
|
|
|
378
368
|
@Test func disabledBrowsable_returnsNone() async {
|
|
379
|
-
// Unavailable means unavailable — a disabled browsable doesn't navigate
|
|
380
|
-
// either (the ladder grays or hides it; a delivered tap stays inert).
|
|
381
369
|
let (selector, _, player) = makeSelector()
|
|
382
370
|
let track = Track(id: "t1", path: "/gone", disabled: true)
|
|
383
371
|
let result = await selector.select(track: track, player: player)
|
package/ios/TrackSelector.swift
CHANGED
|
@@ -13,13 +13,8 @@ import os.log
|
|
|
13
13
|
var queueSourcePath: String? { get }
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
///
|
|
17
|
-
///
|
|
18
|
-
///
|
|
19
|
-
/// Resolves a track selection to a concrete `SelectionResult` describing
|
|
20
|
-
/// what the caller should do. Each caller then executes the action in its
|
|
21
|
-
/// own way (CarPlay: showNowPlaying + completion; HybridAudioBrowser:
|
|
22
|
-
/// direct player calls).
|
|
16
|
+
/// Decides what selecting a track does, for both HybridAudioBrowser and CarPlaySession;
|
|
17
|
+
/// each caller carries out the returned `SelectionResult` its own way.
|
|
23
18
|
@MainActor
|
|
24
19
|
class TrackSelector {
|
|
25
20
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "TrackSelector")
|
|
@@ -32,35 +27,31 @@ class TrackSelector {
|
|
|
32
27
|
// MARK: - Result Types
|
|
33
28
|
|
|
34
29
|
enum SelectionResult {
|
|
35
|
-
/// Playback action determined and not intercepted by JS handler.
|
|
36
30
|
case play(PlaybackIntent)
|
|
37
|
-
///
|
|
31
|
+
/// The app's `handleTrackLoad` took the selection; the caller plays nothing.
|
|
38
32
|
case intercepted
|
|
39
|
-
///
|
|
33
|
+
/// The track has no `src`; the caller navigates to `path`.
|
|
40
34
|
case browse(path: String)
|
|
41
|
-
/// Nothing to do (no src, no path).
|
|
42
35
|
case none
|
|
43
36
|
}
|
|
44
37
|
|
|
45
38
|
enum PlaybackIntent {
|
|
46
|
-
/// Skip to an index in the existing queue.
|
|
47
39
|
case skipTo(index: Int)
|
|
48
|
-
/// Replace queue with new tracks.
|
|
49
40
|
case setQueue(tracks: [Track], startIndex: Int, sourcePath: String?)
|
|
50
|
-
/// Load a single track.
|
|
51
41
|
case loadTrack(Track)
|
|
52
42
|
}
|
|
53
43
|
|
|
54
44
|
// MARK: - Selection
|
|
55
45
|
|
|
56
|
-
/// Resolves a track
|
|
57
|
-
///
|
|
46
|
+
/// Resolves a selection: nothing for a disabled track; for a contextual path, a skip within
|
|
47
|
+
/// the current queue when it came from the same parent, else the parent expanded into a queue
|
|
48
|
+
/// (the track alone if expansion fails); a single track for a `src`; browse for a bare `path`.
|
|
49
|
+
/// A playback is first offered to the app's `handleTrackLoad`, which can intercept it.
|
|
58
50
|
func select(
|
|
59
51
|
track: Track,
|
|
60
52
|
player: some TrackSelectionPlayer,
|
|
61
53
|
) async -> SelectionResult {
|
|
62
|
-
//
|
|
63
|
-
// stale resume path delivered the selection (Track.disabled).
|
|
54
|
+
// Checked here, not only in the UI: a stale resume path can still deliver a disabled track.
|
|
64
55
|
if track.disabled == true {
|
|
65
56
|
return .none
|
|
66
57
|
}
|
|
@@ -104,13 +95,10 @@ class TrackSelector {
|
|
|
104
95
|
let parentPath = BrowserPathHelper.stripTrackId(path)
|
|
105
96
|
let trackId = BrowserPathHelper.extractTrackId(path)
|
|
106
97
|
|
|
107
|
-
//
|
|
108
|
-
//
|
|
109
|
-
//
|
|
110
|
-
// the
|
|
111
|
-
// remains for index-less paths (e.g. pre-stamp persisted state); an
|
|
112
|
-
// index-stamped path with no exact match falls through to expansion,
|
|
113
|
-
// which re-scopes the queue to the tapped section.
|
|
98
|
+
// Exact path first: its `__index` pins the tapped copy when the page holds the same identity
|
|
99
|
+
// more than once. Identity matching is only for index-less paths (e.g. from persisted state
|
|
100
|
+
// without one); an indexed path with no exact match expands instead, re-scoping
|
|
101
|
+
// the queue to the tapped section.
|
|
114
102
|
if parentPath == player.queueSourcePath {
|
|
115
103
|
var skipIndex = player.tracks.firstIndex(where: { $0.path == path })
|
|
116
104
|
if skipIndex == nil, BrowserPathHelper.extractIndex(path) == nil, let trackId {
|