From be75e079e8d4ca91ded694fe942426ccbe4113d6 Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 2 May 2022 12:45:51 +0200 Subject: [PATCH] Fix mess commit reverting --- lib/providers/home.dart | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/providers/home.dart b/lib/providers/home.dart index bdeacb1..3bde3eb 100644 --- a/lib/providers/home.dart +++ b/lib/providers/home.dart @@ -1,7 +1,9 @@ // ignore_for_file: avoid_print import 'dart:convert'; -import 'dart:io'; +import 'package:fip_parser_ui/globals.dart'; +import 'package:flutter/foundation.dart'; +import 'package:universal_io/io.dart'; import 'package:fip_parser_ui/models/track.dart'; import 'package:flutter/material.dart'; import 'package:kplayer/kplayer.dart'; @@ -25,11 +27,12 @@ class HomeProvider with ChangeNotifier { bool stop = false; while (pageNbr < userPageNbr && !stop) { final req = Uri.parse( - 'https://www.radiofrance.fr/api/v1.7/stations/fip/webradios/$radio/songs?pageCursor=$cursor'); + '${proxyHeader}www.radiofrance.fr:443/api/v1.7/stations/fip/webradios/$radio/songs?pageCursor=$cursor'); final res = await get(req, headers: { "Access-Control-Allow-Origin": "*", - "Access-Control-Allow-Methods": "GET, HEAD, POST, OPTIONS" + "Access-Control-Allow-Methods": "GET, HEAD, POST, OPTIONS", + 'Content-Type': 'text/plain' }); if (res.statusCode == 200) { Map body = jsonDecode(res.body); @@ -76,21 +79,14 @@ class HomeProvider with ChangeNotifier { currentTrack = track; final currentVolume = player?.volume ?? 1; - player?.dispose(); + if (player?.playing ?? false) player?.stop(); Future.delayed(const Duration(milliseconds: 5)); - if (track.file == null) { - if (track.id == null) { - final secondMatch = track.artiste == '' ? track.album : track.artiste; - final resultUrl = - await yt.search.search(track.title + ' ' + secondMatch!); - track.id = resultUrl.first.id.value; - } - player = Player.network( - "https://invidious.fdn.fr/embed/${track.id}?raw=1&listen=1"); - print(track.id); - } else { - player = Player.asset(track.file!.path); + if (track.id == null) { + final secondMatch = track.artiste == '' ? track.album : track.artiste; + final resultUrl = + await yt.search.search(track.title + ' ' + secondMatch!); + track.id = resultUrl.first.id.value; } const invidiousUrl = 'yewtu.be'; //yewtu.be vid.puffyan.us invidious.snopyta.org invidious.fdn.fr @@ -108,11 +104,12 @@ class HomeProvider with ChangeNotifier { } Future.delayed(const Duration(milliseconds: 500)); player!.callback = (PlayerEvent event) { + print(event.name); if (event.name == 'position') { currentTrack!.duration = player!.duration; playerProvider.reload(); } - if (event.name == 'status') { + if (event.name == 'status' && player!.position == player!.duration) { var nextTrack = trackList .firstWhere((element) => element.number == track.number + 1); playTrack(context, nextTrack); @@ -130,8 +127,6 @@ class HomeProvider with ChangeNotifier { var streamManifest = StreamManifest(manifest.streams); var streamInfo = streamManifest.audioOnly.withHighestBitrate(); var stream = yt.videos.streamsClient.get(streamInfo); - - final filePath = await getDownloadsDirectory(); final fileName = '${track.title} - ${track.artiste}' .replaceAll('\\', '') .replaceAll('/', '') @@ -142,20 +137,25 @@ class HomeProvider with ChangeNotifier { .replaceAll('<', '') .replaceAll('>', '') .replaceAll('|', ''); - var file = File('${filePath!.path}/$fileName.webm'); - var fileStream = file.openWrite(); - await stream.pipe(fileStream); + if (!kIsWeb) { + final filePath = Platform.isAndroid + ? Directory('/storage/emulated/0/Download') + : await getDownloadsDirectory(); - await fileStream.flush(); - await fileStream.close(); - yt.close(); + var file = File('${filePath!.path}/$fileName.webm'); + var fileStream = file.openWrite(); - // Play it - track.file = file; - // playTrack(context, track); + await stream.pipe(fileStream); - print(file.path); + await fileStream.flush(); + await fileStream.close(); + yt.close(); + + track.file = file; + + print(file.path); + } } List> get radioList {