forked from Nexus/nexus
download audio and video using gomuks
This commit is contained in:
parent
3536f74851
commit
16fdf0c420
6 changed files with 52 additions and 35 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
[submodule "gomuks"]
|
[submodule "gomuks"]
|
||||||
path = gomuks
|
path = gomuks
|
||||||
url = https://github.com/henry-hiles/gomuks
|
url = https://github.com/gomuks/gomuks
|
||||||
branch = main
|
branch = main
|
||||||
|
|
|
||||||
2
gomuks
2
gomuks
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1f11743884a64765b1444b250377a09ebcaba93c
|
Subproject commit 0f8fb261ab57977fa24a4f63b7aafbb9a4ff1b7b
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
|
||||||
import "package:nexus/controllers/header.dart";
|
|
||||||
|
|
||||||
extension GetHeaders on WidgetRef {
|
|
||||||
Map<String, String> get headers =>
|
|
||||||
watch(HeaderController.provider).requireValue;
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
import "dart:async";
|
import "dart:async";
|
||||||
|
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
import "package:flutter_hooks/flutter_hooks.dart";
|
import "package:flutter_hooks/flutter_hooks.dart";
|
||||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||||
import "package:media_kit/media_kit.dart";
|
import "package:media_kit/media_kit.dart";
|
||||||
import "package:nexus/helpers/extensions/get_headers.dart";
|
import "package:nexus/controllers/client.dart";
|
||||||
import "package:nexus/models/info/audio.dart";
|
import "package:nexus/models/info/audio.dart";
|
||||||
|
|
||||||
class AudioPlayer extends HookConsumerWidget {
|
class AudioPlayer extends HookConsumerWidget {
|
||||||
final Uri url;
|
final Uri uri;
|
||||||
final AudioInfo? info;
|
final AudioInfo? info;
|
||||||
|
final bool encrypted;
|
||||||
|
|
||||||
const AudioPlayer(this.url, this.info, {super.key});
|
const AudioPlayer(this.uri, this.info, {this.encrypted = false, super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
|
@ -24,11 +24,12 @@ class AudioPlayer extends HookConsumerWidget {
|
||||||
final duration = useState(Duration.zero);
|
final duration = useState(Duration.zero);
|
||||||
|
|
||||||
useEffect(() {
|
useEffect(() {
|
||||||
|
player.platform?.state = player.platform!.state.copyWith(buffering: true);
|
||||||
scheduleMicrotask(() async {
|
scheduleMicrotask(() async {
|
||||||
await player.open(
|
final video = await ref
|
||||||
Media(url.toString(), httpHeaders: ref.headers),
|
.watch(ClientController.provider.notifier)
|
||||||
play: false,
|
.downloadMedia(.new(mxc: uri, encrypted: encrypted));
|
||||||
);
|
await player.open(Media(video.path), play: false);
|
||||||
|
|
||||||
player.stream.playing.listen((value) {
|
player.stream.playing.listen((value) {
|
||||||
playing.value = value;
|
playing.value = value;
|
||||||
|
|
@ -67,6 +68,12 @@ class AudioPlayer extends HookConsumerWidget {
|
||||||
padding: .only(left: 8, right: 16),
|
padding: .only(left: 8, right: 16),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
|
if (player.state.buffering)
|
||||||
|
SizedBox.square(
|
||||||
|
dimension: 24,
|
||||||
|
child: CircularProgressIndicator(padding: .all(4)),
|
||||||
|
)
|
||||||
|
else
|
||||||
IconButton(
|
IconButton(
|
||||||
onPressed: player.playOrPause,
|
onPressed: player.playOrPause,
|
||||||
icon: Icon(
|
icon: Icon(
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,17 @@ import "dart:async";
|
||||||
|
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||||
|
import "package:nexus/controllers/client.dart";
|
||||||
import "package:nexus/models/info/video.dart";
|
import "package:nexus/models/info/video.dart";
|
||||||
import "package:flutter_hooks/flutter_hooks.dart";
|
import "package:flutter_hooks/flutter_hooks.dart";
|
||||||
import "package:media_kit/media_kit.dart";
|
import "package:media_kit/media_kit.dart";
|
||||||
import "package:media_kit_video/media_kit_video.dart";
|
import "package:media_kit_video/media_kit_video.dart";
|
||||||
import "package:nexus/helpers/extensions/get_headers.dart";
|
|
||||||
|
|
||||||
class VideoPlayer extends HookConsumerWidget {
|
class VideoPlayer extends HookConsumerWidget {
|
||||||
final VideoInfo? info;
|
final VideoInfo? info;
|
||||||
final Uri url;
|
final Uri uri;
|
||||||
const VideoPlayer(this.url, this.info, {super.key});
|
final bool encrypted;
|
||||||
|
const VideoPlayer(this.uri, this.info, {this.encrypted = false, super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
|
@ -21,12 +22,13 @@ class VideoPlayer extends HookConsumerWidget {
|
||||||
final controller = useMemoized(() => VideoController(player));
|
final controller = useMemoized(() => VideoController(player));
|
||||||
|
|
||||||
useEffect(() {
|
useEffect(() {
|
||||||
scheduleMicrotask(
|
player.platform?.state = player.platform!.state.copyWith(buffering: true);
|
||||||
() => player.open(
|
scheduleMicrotask(() async {
|
||||||
Media(url.toString(), httpHeaders: ref.headers),
|
final video = await ref
|
||||||
play: false,
|
.watch(ClientController.provider.notifier)
|
||||||
),
|
.downloadMedia(.new(mxc: uri, encrypted: encrypted));
|
||||||
);
|
await player.open(Media(video.path), play: false);
|
||||||
|
});
|
||||||
|
|
||||||
return player.dispose;
|
return player.dispose;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
|
||||||
|
|
@ -226,10 +226,25 @@ class MessageRenderer extends ConsumerWidget {
|
||||||
ConstrainedBox(
|
ConstrainedBox(
|
||||||
constraints: .loose(.square(500)),
|
constraints: .loose(.square(500)),
|
||||||
child: switch (event.content) {
|
child: switch (event.content) {
|
||||||
VideoMessageContent(:final info) =>
|
VideoMessageContent(
|
||||||
VideoPlayer(url, info),
|
:final info,
|
||||||
AudioMessageContent(:final info) =>
|
:final file,
|
||||||
AudioPlayer(url, info),
|
) =>
|
||||||
|
VideoPlayer(
|
||||||
|
url,
|
||||||
|
info,
|
||||||
|
encrypted: file != null,
|
||||||
|
),
|
||||||
|
AudioMessageContent(
|
||||||
|
:final info,
|
||||||
|
:final file,
|
||||||
|
) =>
|
||||||
|
AudioPlayer(
|
||||||
|
url,
|
||||||
|
info,
|
||||||
|
|
||||||
|
encrypted: file != null,
|
||||||
|
),
|
||||||
FileMessageContent(
|
FileMessageContent(
|
||||||
:final info,
|
:final info,
|
||||||
:final filename,
|
:final filename,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue