Compare commits
1 Commits
master
...
renovate/c
Author | SHA1 | Date | |
---|---|---|---|
|
ceadd0cad8 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -32,6 +32,7 @@
|
||||
/build/
|
||||
|
||||
# Web related
|
||||
lib/generated_plugin_registrant.dart
|
||||
|
||||
# Symbolication related
|
||||
app.*.symbols
|
||||
|
@ -2,12 +2,5 @@
|
||||
|
||||
New generation of music web player for the [music server](https://gitlab.com/pierre42100/musicsserver) written based on Flutter.
|
||||
|
||||
### Debugging
|
||||
Add the following run arguments:
|
||||
|
||||
```bash
|
||||
--dart-define API_URL=<MUSIC_SERVER_ENDPINT> --dart-define API_TOKEN=<API_TOKEN>
|
||||
```
|
||||
|
||||
## Screenshot
|
||||
![screenshot of app](img/screenshot-1.jpg)
|
@ -30,7 +30,7 @@ typedef MusicsList = List<MusicEntry>;
|
||||
class API {
|
||||
/// Get the list of music
|
||||
static Future<MusicsList> getList() async {
|
||||
final response = await Dio().get("${config.apiURL}/list",
|
||||
final response = await Dio().get(config.apiURL + "/list",
|
||||
options: Options(headers: {"Token": config.apiToken}));
|
||||
|
||||
if (response.statusCode != 200) {
|
||||
|
@ -1,19 +1,16 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:music_web_player/api.dart';
|
||||
import 'package:music_web_player/config.dart';
|
||||
|
||||
class CoverImage extends StatefulWidget {
|
||||
class CoverImage extends StatelessWidget {
|
||||
final MusicEntry music;
|
||||
final double? width;
|
||||
final double? height;
|
||||
final BoxFit? fit;
|
||||
final Icon? icon;
|
||||
final Color? backgroundColor;
|
||||
final Duration? delayLoading;
|
||||
|
||||
const CoverImage({
|
||||
Key? key,
|
||||
@ -23,61 +20,31 @@ class CoverImage extends StatefulWidget {
|
||||
this.icon,
|
||||
this.fit,
|
||||
this.backgroundColor,
|
||||
this.delayLoading,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() => _CoverImageState();
|
||||
}
|
||||
|
||||
class _CoverImageState extends State<CoverImage> {
|
||||
var _canShowImage = true;
|
||||
Timer? _timer;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
if (widget.delayLoading != null) {
|
||||
_canShowImage = false;
|
||||
Timer(widget.delayLoading!, () {
|
||||
if (mounted) {
|
||||
setState(() => _canShowImage = true);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
_timer?.cancel();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (!_canShowImage) return _loadingWidget(null);
|
||||
return CachedNetworkImage(
|
||||
width: widget.width,
|
||||
height: widget.height,
|
||||
width: width,
|
||||
height: height,
|
||||
imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
|
||||
imageUrl: widget.music.coverURL,
|
||||
cacheKey: widget.music.coverCacheKey,
|
||||
imageUrl: music.coverURL,
|
||||
cacheKey: music.coverCacheKey,
|
||||
httpHeaders: {"Token": config.apiToken},
|
||||
useOldImageOnUrlChange: false,
|
||||
progressIndicatorBuilder: (c, s, p) => _loadingWidget(p.progress),
|
||||
fit: widget.fit,
|
||||
fit: fit,
|
||||
errorWidget: (c, s, e) => _loadingWidget(null),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _loadingWidget(double? progress) => Container(
|
||||
color: widget.backgroundColor ?? Colors.black,
|
||||
width: widget.width,
|
||||
height: widget.height,
|
||||
color: backgroundColor ?? Colors.black,
|
||||
width: width,
|
||||
height: height,
|
||||
child: Center(
|
||||
child: progress == null
|
||||
? widget.icon
|
||||
? icon
|
||||
: CircularProgressIndicator(value: progress),
|
||||
),
|
||||
);
|
||||
|
@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
|
||||
import 'package:music_web_player/api.dart';
|
||||
import 'package:music_web_player/ui/cover_image.dart';
|
||||
import 'package:music_web_player/ui/player_web_interface.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
extension DurationExt on Duration {
|
||||
@ -17,7 +16,7 @@ extension DurationExt on Duration {
|
||||
}
|
||||
}
|
||||
|
||||
const smartphoneSize = 700;
|
||||
const double playlistWidth = 300;
|
||||
|
||||
class MusicPlayer extends StatefulWidget {
|
||||
final MusicsList musicsList;
|
||||
@ -43,9 +42,7 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
final List<MusicEntry> _stack = [];
|
||||
int currMusicPos = 0;
|
||||
|
||||
var _showPlaylist = true;
|
||||
|
||||
var _playFilteredMusics = false;
|
||||
var _showPlaylist = false;
|
||||
|
||||
final _filterController = fluent.TextEditingController();
|
||||
MusicsList? _filteredList;
|
||||
@ -55,11 +52,8 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
|
||||
// Automatically choose next music if required
|
||||
if (currMusicPos >= _stack.length) {
|
||||
var list = (_playFilteredMusics && (_filteredList?.length ?? 0) > 1)
|
||||
? _filteredList ?? widget.musicsList
|
||||
: widget.musicsList;
|
||||
var nextId = rng.nextInt(list.length);
|
||||
_stack.add(list[nextId]);
|
||||
var nextId = rng.nextInt(widget.musicsList.length);
|
||||
_stack.add(widget.musicsList[nextId]);
|
||||
}
|
||||
|
||||
return _stack[currMusicPos];
|
||||
@ -156,111 +150,65 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (!_showPlaylist) {
|
||||
return _playerWithoutPlaylistPane();
|
||||
} else {
|
||||
return _playerWithPlaylistPane();
|
||||
}
|
||||
}
|
||||
return LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final mainAreaWidth =
|
||||
constraints.maxWidth - (_showPlaylist ? playlistWidth : 0);
|
||||
|
||||
Widget _playerWithoutPlaylistPane() => _buildWithBackground(LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
return fluent.Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: constraints.maxWidth,
|
||||
child: Stack(
|
||||
children: [
|
||||
fluent.SizedBox(
|
||||
width: constraints.maxWidth,
|
||||
child: _buildPlayerWidget(),
|
||||
),
|
||||
Positioned(
|
||||
top: 10,
|
||||
right: 10,
|
||||
child: fluent.Row(
|
||||
children: [
|
||||
_buildToggleListButton(),
|
||||
],
|
||||
)),
|
||||
Positioned(
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
child: fluent.Row(
|
||||
children: [
|
||||
_buildDownloadTrackButton(),
|
||||
const SizedBox(width: 10),
|
||||
_buildAboutButton(),
|
||||
],
|
||||
)),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
));
|
||||
return fluent.Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: mainAreaWidth,
|
||||
child: Stack(
|
||||
children: [
|
||||
// Background image
|
||||
CoverImage(
|
||||
music: currMusic,
|
||||
width: mainAreaWidth,
|
||||
height: constraints.maxHeight,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
|
||||
Widget _playerWithPlaylistPane() => LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
const double playerSize = 100;
|
||||
return Column(
|
||||
children: [
|
||||
fluent.SizedBox(
|
||||
height: constraints.maxHeight - playerSize,
|
||||
child: _buildPlaylistPane(),
|
||||
),
|
||||
fluent.SizedBox(
|
||||
height: playerSize,
|
||||
width: constraints.maxWidth,
|
||||
child: _buildWithBackground(
|
||||
_buildSmallPlayerWidget(constraints.maxWidth)),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
Widget _buildWithBackground(Widget child) => LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
return fluent.Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: constraints.maxWidth,
|
||||
child: Stack(
|
||||
children: [
|
||||
// Background image
|
||||
CoverImage(
|
||||
music: currMusic,
|
||||
width: constraints.maxWidth,
|
||||
height: constraints.maxHeight,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
|
||||
// Blur background image
|
||||
ClipRRect(
|
||||
// Clip it cleanly.
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
|
||||
child: Container(
|
||||
color: Colors.black.withOpacity(0.8),
|
||||
alignment: Alignment.center,
|
||||
child: SizedBox(
|
||||
width: constraints.maxWidth,
|
||||
height: constraints.maxHeight,
|
||||
),
|
||||
// Blur background image
|
||||
ClipRRect(
|
||||
// Clip it cleanly.
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
|
||||
child: Container(
|
||||
color: Colors.black.withOpacity(0.8),
|
||||
alignment: Alignment.center,
|
||||
child: SizedBox(
|
||||
width: mainAreaWidth,
|
||||
height: constraints.maxHeight,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
child
|
||||
],
|
||||
),
|
||||
fluent.SizedBox(
|
||||
width: mainAreaWidth,
|
||||
child: _buildPlayerWidget(),
|
||||
),
|
||||
|
||||
Positioned(
|
||||
top: 10, right: 10, child: _buildToggleListButton()),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
),
|
||||
|
||||
// Playlist
|
||||
_showPlaylist
|
||||
? SizedBox(
|
||||
width: playlistWidth,
|
||||
height: constraints.maxHeight,
|
||||
child: _buildPlaylistPane(),
|
||||
)
|
||||
: Container(),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildPlayerWidget() => fluent.Center(
|
||||
child: SizedBox(
|
||||
@ -269,7 +217,11 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
mainAxisAlignment: fluent.MainAxisAlignment.center,
|
||||
crossAxisAlignment: fluent.CrossAxisAlignment.center,
|
||||
children: [
|
||||
RoundedImage(
|
||||
Material(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(18.0),
|
||||
),
|
||||
clipBehavior: Clip.hardEdge,
|
||||
child: CoverImage(
|
||||
width: 250,
|
||||
height: 250,
|
||||
@ -293,144 +245,45 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
children: [
|
||||
DurationText(_position),
|
||||
const SizedBox(width: 15),
|
||||
_buildProgressBar(),
|
||||
Flexible(
|
||||
child: fluent.Slider(
|
||||
max: _duration?.inSeconds as double? ?? 0,
|
||||
value: _position?.inSeconds as double? ?? 0,
|
||||
onChanged: (d) =>
|
||||
_updatePosition(Duration(seconds: d.toInt())),
|
||||
label: _position?.formatted,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
DurationText(_duration),
|
||||
],
|
||||
),
|
||||
const fluent.SizedBox(height: 40),
|
||||
_buildPlayersIcons(),
|
||||
fluent.Row(
|
||||
children: [
|
||||
IconButton(
|
||||
icon: const PlayerIcon(fluent.FluentIcons.previous),
|
||||
onPressed: currMusicPos == 0 ? null : _playPrevious,
|
||||
),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: PlayerIcon(_isPlaying
|
||||
? fluent.FluentIcons.pause
|
||||
: fluent.FluentIcons.play),
|
||||
onPressed: _isPlaying ? _pause : _play,
|
||||
),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: const PlayerIcon(fluent.FluentIcons.next),
|
||||
onPressed: _playNext,
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Widget _buildSmallPlayerWidget(double width) {
|
||||
var partSize = width > smartphoneSize ? width / 3 : width / 2.5;
|
||||
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
fluent.ClipRect(
|
||||
child: SizedBox(
|
||||
width: partSize,
|
||||
child: Row(
|
||||
children: [
|
||||
RoundedImage(
|
||||
child: CoverImage(
|
||||
music: currMusic,
|
||||
width: 80,
|
||||
height: 80,
|
||||
fit: BoxFit.cover,
|
||||
backgroundColor: Colors.black12,
|
||||
icon: const Icon(FluentIcons.music_note_2_24_regular,
|
||||
size: 30),
|
||||
),
|
||||
),
|
||||
// Artist area
|
||||
const SizedBox(width: 10),
|
||||
fluent.ClipRect(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(
|
||||
currMusic.title,
|
||||
style: const TextStyle(fontSize: 22),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
Text(
|
||||
currMusic.artist,
|
||||
textAlign: TextAlign.start,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: partSize,
|
||||
child: Column(
|
||||
children: [
|
||||
fluent.Row(
|
||||
children: [
|
||||
DurationText(_position),
|
||||
const SizedBox(width: 20),
|
||||
_buildProgressBar(),
|
||||
const SizedBox(width: 20),
|
||||
DurationText(_duration),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
_buildPlayersIcons(25),
|
||||
],
|
||||
)),
|
||||
const Spacer(),
|
||||
_buildToggleListButton()
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildPlayersIcons([double? size]) => fluent.Row(
|
||||
children: [
|
||||
IconButton(
|
||||
icon: PlayerIcon(
|
||||
fluent.FluentIcons.previous,
|
||||
size: size,
|
||||
),
|
||||
onPressed: currMusicPos == 0 ? null : _playPrevious,
|
||||
),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: PlayerIcon(
|
||||
_isPlaying ? fluent.FluentIcons.pause : fluent.FluentIcons.play,
|
||||
size: size,
|
||||
),
|
||||
onPressed: _isPlaying ? _pause : _play,
|
||||
),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: PlayerIcon(
|
||||
fluent.FluentIcons.next,
|
||||
size: size,
|
||||
),
|
||||
onPressed: _playNext,
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
Widget _buildProgressBar() => Flexible(
|
||||
child: fluent.Slider(
|
||||
max: _duration?.inSeconds as double? ?? 0,
|
||||
value: _position?.inSeconds as double? ?? 0,
|
||||
onChanged: (d) => _updatePosition(Duration(seconds: d.toInt())),
|
||||
label: _position?.formatted,
|
||||
),
|
||||
);
|
||||
|
||||
Widget _buildDownloadTrackButton() => fluent.Button(
|
||||
onPressed: () =>
|
||||
launchUrlString(currMusic.musicURL, webOnlyWindowName: "_blank"),
|
||||
child: const fluent.Icon(fluent.FluentIcons.download),
|
||||
);
|
||||
|
||||
Widget _buildAboutButton() => fluent.Button(
|
||||
onPressed: () => showLicensePage(
|
||||
context: context,
|
||||
applicationName: "Music Player",
|
||||
applicationIcon:
|
||||
const fluent.Icon(FluentIcons.music_note_2_24_regular),
|
||||
),
|
||||
child: const fluent.Icon(fluent.FluentIcons.info),
|
||||
);
|
||||
|
||||
Widget _buildToggleListButton() => fluent.ToggleButton(
|
||||
checked: _showPlaylist,
|
||||
onChanged: (s) => setState(() => _showPlaylist = s),
|
||||
@ -441,8 +294,6 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
return Column(
|
||||
children: [
|
||||
fluent.TextBox(
|
||||
decoration: const BoxDecoration(border: Border()),
|
||||
minHeight: 20,
|
||||
controller: _filterController,
|
||||
placeholder: "Filter list...",
|
||||
onChanged: (s) => _refreshFilteredList(),
|
||||
@ -458,17 +309,6 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
itemBuilder: (c, i) {
|
||||
final music = (_filteredList ?? widget.musicsList)[i];
|
||||
return ListTile(
|
||||
leading: RoundedImage(
|
||||
child: CoverImage(
|
||||
delayLoading: const Duration(seconds: 2),
|
||||
music: music,
|
||||
width: 50,
|
||||
height: 50,
|
||||
fit: BoxFit.cover,
|
||||
backgroundColor: Colors.transparent,
|
||||
icon: const Icon(Icons.music_note),
|
||||
),
|
||||
),
|
||||
title: Text(music.title),
|
||||
subtitle: Text(music.artist),
|
||||
selected: currMusic == music,
|
||||
@ -478,15 +318,6 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
itemCount: (_filteredList ?? widget.musicsList).length,
|
||||
),
|
||||
),
|
||||
(_filteredList?.length ?? 0) < 2
|
||||
? Container()
|
||||
: ListTile(
|
||||
leading: fluent.ToggleSwitch(
|
||||
checked: _playFilteredMusics,
|
||||
onChanged: (v) => setState(() => _playFilteredMusics = v),
|
||||
),
|
||||
title: const Text("Play only filtered musics"),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
@ -494,12 +325,11 @@ class _MusicPlayerState extends State<MusicPlayer> {
|
||||
|
||||
class PlayerIcon extends StatelessWidget {
|
||||
final IconData icon;
|
||||
final double? size;
|
||||
|
||||
const PlayerIcon(this.icon, {Key? key, this.size}) : super(key: key);
|
||||
const PlayerIcon(this.icon, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Icon(icon, size: size ?? 35);
|
||||
Widget build(BuildContext context) => Icon(icon, size: 35);
|
||||
}
|
||||
|
||||
class DurationText extends StatelessWidget {
|
||||
@ -515,20 +345,3 @@ class DurationText extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class RoundedImage extends StatelessWidget {
|
||||
final Widget child;
|
||||
|
||||
const RoundedImage({Key? key, required this.child}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Material(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(18.0),
|
||||
),
|
||||
clipBehavior: Clip.hardEdge,
|
||||
child: child,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -20,11 +20,11 @@ class PlayerApp extends StatelessWidget {
|
||||
brightness: Brightness.dark,
|
||||
),
|
||||
home: fluent.FluentTheme(
|
||||
child: const AppHome(),
|
||||
data: fluent.ThemeData(
|
||||
iconTheme: const IconThemeData(color: Colors.white),
|
||||
brightness: fluent.Brightness.dark,
|
||||
),
|
||||
child: const AppHome(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
@ -6,10 +6,6 @@
|
||||
|
||||
#include "generated_plugin_registrant.h"
|
||||
|
||||
#include <url_launcher_linux/url_launcher_plugin.h>
|
||||
|
||||
void fl_register_plugins(FlPluginRegistry* registry) {
|
||||
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
|
||||
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
|
||||
}
|
||||
|
@ -3,10 +3,6 @@
|
||||
#
|
||||
|
||||
list(APPEND FLUTTER_PLUGIN_LIST
|
||||
url_launcher_linux
|
||||
)
|
||||
|
||||
list(APPEND FLUTTER_FFI_PLUGIN_LIST
|
||||
)
|
||||
|
||||
set(PLUGIN_BUNDLED_LIBRARIES)
|
||||
@ -17,8 +13,3 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
|
||||
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
|
||||
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
|
||||
endforeach(plugin)
|
||||
|
||||
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
|
||||
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
|
||||
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
|
||||
endforeach(ffi_plugin)
|
||||
|
484
player-server/Cargo.lock
generated
484
player-server/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -10,4 +10,4 @@ actix-files = "0.6.0"
|
||||
actix-web = "4"
|
||||
env_logger = "0.9.0"
|
||||
log = "0.4"
|
||||
clap = { version = "4.0.7", features = ["derive", "env"] }
|
||||
clap = { version = "3.1.6", features = ["derive", "env"] }
|
@ -1,7 +1,7 @@
|
||||
use std::path::Path;
|
||||
|
||||
use actix_files::Files;
|
||||
use actix_web::{middleware::Logger, web, App, HttpResponse, HttpServer};
|
||||
use actix_web::{App, HttpResponse, HttpServer, middleware::Logger, web};
|
||||
use clap::Parser;
|
||||
|
||||
/// Music web player server
|
||||
@ -32,10 +32,7 @@ async fn main_js_file(data: web::Data<Args>) -> HttpResponse {
|
||||
let script = file
|
||||
.replace("<<<API_URL>>>", &data.api_url)
|
||||
.replace("<<<API_TOKEN>>>", &data.api_token)
|
||||
.replace(
|
||||
"https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf",
|
||||
"/fonts/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf",
|
||||
);
|
||||
.replace("https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf", "/fonts/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf");
|
||||
|
||||
HttpResponse::Ok()
|
||||
.content_type("application/javascript")
|
||||
@ -57,7 +54,7 @@ async fn main() -> std::io::Result<()> {
|
||||
.wrap(Logger::default())
|
||||
.app_data(web::Data::new(args_cp.clone()))
|
||||
})
|
||||
.bind(args.listen_address)?
|
||||
.run()
|
||||
.await
|
||||
}
|
||||
.bind(args.listen_address)?
|
||||
.run()
|
||||
.await
|
||||
}
|
178
pubspec.lock
178
pubspec.lock
@ -7,7 +7,7 @@ packages:
|
||||
name: async
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.9.0"
|
||||
version: "2.8.2"
|
||||
audio_service_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -35,28 +35,35 @@ packages:
|
||||
name: cached_network_image
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.2.2"
|
||||
version: "3.2.0"
|
||||
cached_network_image_platform_interface:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: cached_network_image_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
version: "1.0.0"
|
||||
cached_network_image_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cached_network_image_web
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
version: "1.0.1"
|
||||
characters:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: characters
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
version: "1.2.0"
|
||||
charcode:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: charcode
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
chewie_audio:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -70,77 +77,77 @@ packages:
|
||||
name: clock
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.0"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.16.0"
|
||||
version: "1.15.0"
|
||||
crypto:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: crypto
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.2"
|
||||
version: "3.0.1"
|
||||
csslib:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: csslib
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.17.2"
|
||||
version: "0.17.1"
|
||||
cupertino_icons:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: cupertino_icons
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
version: "1.0.4"
|
||||
dio:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dio
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.0.6"
|
||||
version: "4.0.4"
|
||||
fake_async:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fake_async
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
version: "1.2.0"
|
||||
ffi:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: ffi
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
version: "1.1.2"
|
||||
file:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.1.4"
|
||||
version: "6.1.2"
|
||||
fluent_ui:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: fluent_ui
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.0.1"
|
||||
version: "3.9.1"
|
||||
fluentui_system_icons:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: fluentui_system_icons
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.182"
|
||||
version: "1.1.162"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
@ -152,7 +159,7 @@ packages:
|
||||
name: flutter_blurhash
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.7.0"
|
||||
version: "0.6.4"
|
||||
flutter_cache_manager:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -166,12 +173,7 @@ packages:
|
||||
name: flutter_lints
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
flutter_localizations:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
version: "1.0.4"
|
||||
flutter_test:
|
||||
dependency: "direct dev"
|
||||
description: flutter
|
||||
@ -195,14 +197,14 @@ packages:
|
||||
name: http
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.13.5"
|
||||
version: "0.13.4"
|
||||
http_parser:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http_parser
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.0.1"
|
||||
version: "4.0.0"
|
||||
intl:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -216,98 +218,98 @@ packages:
|
||||
name: js
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.6.4"
|
||||
version: "0.6.3"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: lints
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
version: "1.0.1"
|
||||
matcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.12.12"
|
||||
version: "0.12.11"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: material_color_utilities
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.1.5"
|
||||
version: "0.1.3"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.8.0"
|
||||
version: "1.7.0"
|
||||
octo_image:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: octo_image
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
version: "1.0.1"
|
||||
path:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.8.2"
|
||||
version: "1.8.0"
|
||||
path_provider:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.11"
|
||||
version: "2.0.9"
|
||||
path_provider_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_android
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.20"
|
||||
version: "2.0.12"
|
||||
path_provider_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_ios
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.11"
|
||||
version: "2.0.8"
|
||||
path_provider_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_linux
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.7"
|
||||
version: "2.1.5"
|
||||
path_provider_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_macos
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.6"
|
||||
version: "2.0.5"
|
||||
path_provider_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.5"
|
||||
version: "2.0.3"
|
||||
path_provider_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_windows
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.3"
|
||||
version: "2.0.5"
|
||||
pedantic:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -328,7 +330,7 @@ packages:
|
||||
name: plugin_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.3"
|
||||
version: "2.1.2"
|
||||
process:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -342,14 +344,14 @@ packages:
|
||||
name: recase
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.1.0"
|
||||
version: "4.0.0"
|
||||
rxdart:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: rxdart
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.27.5"
|
||||
version: "0.27.3"
|
||||
scroll_pos:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -368,21 +370,21 @@ packages:
|
||||
name: source_span
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.9.0"
|
||||
version: "1.8.1"
|
||||
sqflite:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: sqflite
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
version: "2.0.2"
|
||||
sqflite_common:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: sqflite_common
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.0"
|
||||
version: "2.2.1"
|
||||
stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -403,91 +405,35 @@ packages:
|
||||
name: string_scanner
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.0"
|
||||
synchronized:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: synchronized
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.0+3"
|
||||
version: "3.0.0"
|
||||
term_glyph:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: term_glyph
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
version: "1.2.0"
|
||||
test_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.4.12"
|
||||
version: "0.4.8"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: typed_data
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
url_launcher:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: url_launcher
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.1.6"
|
||||
url_launcher_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_android
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.0.19"
|
||||
url_launcher_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_ios
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.0.17"
|
||||
url_launcher_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_linux
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
url_launcher_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_macos
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
url_launcher_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
url_launcher_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_web
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.13"
|
||||
url_launcher_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_windows
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "1.3.0"
|
||||
uuid:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -501,56 +447,56 @@ packages:
|
||||
name: vector_math
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.2"
|
||||
version: "2.1.1"
|
||||
video_player:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: video_player
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.4.7"
|
||||
version: "2.3.0"
|
||||
video_player_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_android
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.9"
|
||||
version: "2.3.1"
|
||||
video_player_avfoundation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_avfoundation
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.6"
|
||||
version: "2.3.1"
|
||||
video_player_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.1.4"
|
||||
version: "5.1.1"
|
||||
video_player_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_web
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.12"
|
||||
version: "2.0.7"
|
||||
win32:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: win32
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.0"
|
||||
version: "2.4.4"
|
||||
xdg_directories:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: xdg_directories
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.2.0+2"
|
||||
version: "0.2.0+1"
|
||||
sdks:
|
||||
dart: ">=2.18.0 <3.0.0"
|
||||
flutter: ">=3.3.0"
|
||||
dart: ">=2.16.1 <3.0.0"
|
||||
flutter: ">=2.8.0"
|
||||
|
13
pubspec.yaml
13
pubspec.yaml
@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||
version: 1.0.0+1
|
||||
|
||||
environment:
|
||||
sdk: ">=2.17.0 <3.0.0"
|
||||
sdk: ">=2.16.1 <3.0.0"
|
||||
|
||||
# Dependencies specify other packages that your package needs in order to work.
|
||||
# To automatically upgrade your package dependencies to the latest versions
|
||||
@ -39,12 +39,12 @@ dependencies:
|
||||
dio: ^4.0.4
|
||||
|
||||
# Fluent ui
|
||||
fluent_ui: ^4.0.1
|
||||
fluent_ui: ^3.9.1
|
||||
fluentui_system_icons: ^1.1.162
|
||||
|
||||
# Image processing
|
||||
cached_network_image: ^3.2.2
|
||||
cached_network_image_platform_interface: ^2.0.0
|
||||
cached_network_image: ^3.2.0
|
||||
cached_network_image_platform_interface: ^1.0.0
|
||||
|
||||
# Audio player
|
||||
video_player: ^2.3.0
|
||||
@ -53,9 +53,6 @@ dependencies:
|
||||
# Audio integration in browser
|
||||
audio_service_web: ^0.1.1
|
||||
|
||||
# Open external links
|
||||
url_launcher: ^6.1.2
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
@ -65,7 +62,7 @@ dev_dependencies:
|
||||
# activated in the `analysis_options.yaml` file located at the root of your
|
||||
# package. See that file for information about deactivating specific lint
|
||||
# rules and activating additional ones.
|
||||
flutter_lints: ^2.0.1
|
||||
flutter_lints: ^1.0.0
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
# following page: https://dart.dev/tools/pub/pubspec
|
||||
|
3
renovate.json
Normal file
3
renovate.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
||||
}
|
@ -29,7 +29,7 @@
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png"/>
|
||||
|
||||
<title>Music Web Player</title>
|
||||
<title>music_web_player</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
|
||||
<style type="text/css">
|
||||
|
Loading…
Reference in New Issue
Block a user