Merge branch 'fix/hls_nested_uri' into minor

ryanheise · Mar 20, 2023 · 097e04d · 097e04d
2 parents e7aedc8 + 932fdcc
commit 097e04d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/just_audio/CHANGELOG.md b/just_audio/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Fix ignored tag parameter in AudioSource.asset().
 * Fix ignored tag parameter in AudioSource.file().
+* Fix nested URIs in HLS from EXT-X-MEDIA when using headers.
 
 ## 0.9.31
 

diff --git a/just_audio/example/lib/common.dart b/just_audio/example/lib/common.dart
@@ -101,7 +101,7 @@ class SeekBarState extends State<SeekBar> {
                       .firstMatch("$_remaining")
                       ?.group(1) ??
                   '$_remaining',
-              style: Theme.of(context).textTheme.caption),
+              style: Theme.of(context).textTheme.bodySmall),
         ),
       ],
     );

diff --git a/just_audio/example/lib/example_playlist.dart b/just_audio/example/lib/example_playlist.dart
@@ -181,7 +181,7 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
                           ),
                         ),
                         Text(metadata.album,
-                            style: Theme.of(context).textTheme.headline6),
+                            style: Theme.of(context).textTheme.titleLarge),
                         Text(metadata.title),
                       ],
                     );
@@ -235,7 +235,7 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
                   Expanded(
                     child: Text(
                       "Playlist",
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                       textAlign: TextAlign.center,
                     ),
                   ),

diff --git a/just_audio/example/lib/example_radio.dart b/just_audio/example/lib/example_radio.dart
@@ -94,7 +94,7 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
                         Padding(
                           padding: const EdgeInsets.only(top: 8.0),
                           child: Text(title,
-                              style: Theme.of(context).textTheme.headline6),
+                              style: Theme.of(context).textTheme.titleLarge),
                         ),
                       ],
                     );

diff --git a/just_audio/lib/just_audio.dart b/just_audio/lib/just_audio.dart
@@ -3197,6 +3197,8 @@ _ProxyHandler _proxyHandlerForUri(
         // TODO: Handle other playlist formats similarly?
         final m3u8 = await originResponse.transform(utf8.decoder).join();
         for (var line in const LineSplitter().convert(m3u8)) {
+          line = line.replaceAllMapped(
+              RegExp(r'#EXT-X-MEDIA:.*?URI="(.*?)".*'), (m) => m[1]!);
           line = line.replaceAll(RegExp(r'#.*$'), '').trim();
           if (line.isEmpty) continue;
           try {