mirror of
https://github.com/austinried/subtracks.git
synced 2025-12-29 17:39:27 +01:00
Compare commits
2 Commits
1a35a69581
...
65ba930546
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65ba930546 | ||
|
|
3e3b08b316 |
@ -4,6 +4,7 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
|||||||
|
|
||||||
import '../services/sync_service.dart';
|
import '../services/sync_service.dart';
|
||||||
import 'items.dart';
|
import 'items.dart';
|
||||||
|
import 'snackbars.dart';
|
||||||
|
|
||||||
class PagedListQueryView<T> extends HookConsumerWidget {
|
class PagedListQueryView<T> extends HookConsumerWidget {
|
||||||
final PagingController<int, T> pagingController;
|
final PagingController<int, T> pagingController;
|
||||||
@ -122,7 +123,13 @@ class SyncAllRefresh extends HookConsumerWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
return RefreshIndicator(
|
return RefreshIndicator(
|
||||||
onRefresh: () => ref.read(syncServiceProvider.notifier).syncAll(),
|
onRefresh: () async {
|
||||||
|
try {
|
||||||
|
await ref.read(syncServiceProvider.notifier).syncAll();
|
||||||
|
} catch (e) {
|
||||||
|
showErrorSnackbar(context, e.toString());
|
||||||
|
}
|
||||||
|
},
|
||||||
child: child,
|
child: child,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,26 +15,17 @@ class SubtracksHttpClient extends BaseClient {
|
|||||||
@override
|
@override
|
||||||
Future<StreamedResponse> send(BaseRequest request) {
|
Future<StreamedResponse> send(BaseRequest request) {
|
||||||
request.headers.addAll(subtracksHeaders);
|
request.headers.addAll(subtracksHeaders);
|
||||||
log.info('${request.method} ${_redactUri(request.url)}');
|
log.info('${request.method} ${request.url}');
|
||||||
|
|
||||||
|
try {
|
||||||
return request.send();
|
return request.send();
|
||||||
|
} catch (e, st) {
|
||||||
|
log.severe('HTTP client: ${request.method} ${request.url}', e, st);
|
||||||
|
rethrow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String _redactUri(Uri uri) {
|
|
||||||
var redacted = uri.toString();
|
|
||||||
redacted = _redactParam(redacted, 'u');
|
|
||||||
redacted = _redactParam(redacted, 'p');
|
|
||||||
redacted = _redactParam(redacted, 's');
|
|
||||||
redacted = _redactParam(redacted, 't');
|
|
||||||
|
|
||||||
return redacted.toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RegExp _queryReplace(String key) => RegExp('$key=([^&|\\n|\\t\\s]+)');
|
|
||||||
|
|
||||||
String _redactParam(String url, String key) =>
|
|
||||||
url.replaceFirst(_queryReplace(key), '$key=REDACTED');
|
|
||||||
|
|
||||||
@Riverpod(keepAlive: true)
|
@Riverpod(keepAlive: true)
|
||||||
BaseClient httpClient(HttpClientRef ref) {
|
BaseClient httpClient(HttpClientRef ref) {
|
||||||
return SubtracksHttpClient();
|
return SubtracksHttpClient();
|
||||||
|
|||||||
68
lib/log.dart
68
lib/log.dart
@ -88,6 +88,7 @@ String _format(
|
|||||||
bool color = false,
|
bool color = false,
|
||||||
bool time = true,
|
bool time = true,
|
||||||
bool level = true,
|
bool level = true,
|
||||||
|
bool redact = true,
|
||||||
}) {
|
}) {
|
||||||
var message = '';
|
var message = '';
|
||||||
if (time) message += '${event.time.toIso8601String()} ';
|
if (time) message += '${event.time.toIso8601String()} ';
|
||||||
@ -107,6 +108,11 @@ String _format(
|
|||||||
if (event.error != null) {
|
if (event.error != null) {
|
||||||
message += '\n${event.error}';
|
message += '\n${event.error}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (redact) {
|
||||||
|
message = _redactUrl(message);
|
||||||
|
}
|
||||||
|
|
||||||
if (event.stackTrace != null) {
|
if (event.stackTrace != null) {
|
||||||
message += '\n${event.stackTrace}';
|
message += '\n${event.stackTrace}';
|
||||||
}
|
}
|
||||||
@ -116,17 +122,24 @@ String _format(
|
|||||||
: message;
|
: message;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _printFile(String event, String dir) async {
|
String _redactUrl(String message) {
|
||||||
final now = DateTime.now();
|
if (!_queryReplace('u').hasMatch(message)) {
|
||||||
final file = File(p.join(dir, '${now.year}-${now.month}-${now.day}.txt'));
|
return message;
|
||||||
|
|
||||||
if (!event.endsWith('\n')) {
|
|
||||||
event += '\n';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await file.writeAsString(event, mode: FileMode.writeOnlyAppend, flush: true);
|
message = _redactParam(message, 'u');
|
||||||
|
message = _redactParam(message, 'p');
|
||||||
|
message = _redactParam(message, 's');
|
||||||
|
message = _redactParam(message, 't');
|
||||||
|
|
||||||
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RegExp _queryReplace(String key) => RegExp('$key=([^&|\\n|\\t\\s]+)');
|
||||||
|
|
||||||
|
String _redactParam(String url, String key) =>
|
||||||
|
url.replaceAll(_queryReplace(key), '$key=REDACTED');
|
||||||
|
|
||||||
Future<Directory> logDirectory() async {
|
Future<Directory> logDirectory() async {
|
||||||
return Directory(
|
return Directory(
|
||||||
p.join((await getApplicationDocumentsDirectory()).path, 'logs'),
|
p.join((await getApplicationDocumentsDirectory()).path, 'logs'),
|
||||||
@ -141,11 +154,43 @@ Future<List<File>> logFiles() async {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File _currentLogFile(String logDir) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
return File(p.join(logDir, '${now.year}-${now.month}-${now.day}.txt'));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _printFile(String event, String logDir) async {
|
||||||
|
final file = _currentLogFile(logDir);
|
||||||
|
|
||||||
|
if (!event.endsWith('\n')) {
|
||||||
|
event += '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
await file.writeAsString(event, mode: FileMode.writeOnlyAppend, flush: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _printDebug(LogRecord event) {
|
||||||
|
// ignore: avoid_print
|
||||||
|
print(_format(event, color: true, time: false, level: false, redact: false));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _printRelease(LogRecord event, String logDir) async {
|
||||||
|
await _printFile(
|
||||||
|
_format(event, color: false, time: true, level: true, redact: true),
|
||||||
|
logDir,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
final log = Logger('default');
|
final log = Logger('default');
|
||||||
|
|
||||||
Future<void> initLogging() async {
|
Future<void> initLogging() async {
|
||||||
final dir = (await logDirectory())..create();
|
final dir = (await logDirectory())..create();
|
||||||
|
|
||||||
|
final file = _currentLogFile(dir.path);
|
||||||
|
if (!(await file.exists())) {
|
||||||
|
await file.create();
|
||||||
|
}
|
||||||
|
|
||||||
final files = await logFiles();
|
final files = await logFiles();
|
||||||
if (files.length > 7) {
|
if (files.length > 7) {
|
||||||
for (var file in files.slice(7)) {
|
for (var file in files.slice(7)) {
|
||||||
@ -156,14 +201,9 @@ Future<void> initLogging() async {
|
|||||||
Logger.root.level = kDebugMode ? Level.ALL : Level.INFO;
|
Logger.root.level = kDebugMode ? Level.ALL : Level.INFO;
|
||||||
Logger.root.onRecord.asyncMap((event) async {
|
Logger.root.onRecord.asyncMap((event) async {
|
||||||
if (kDebugMode) {
|
if (kDebugMode) {
|
||||||
print(_format(event, color: true, time: false, level: false));
|
_printDebug(event);
|
||||||
} else {
|
} else {
|
||||||
await _printFile(
|
await _printRelease(event, dir.path);
|
||||||
_format(event, color: false, time: true, level: true),
|
|
||||||
dir.path,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}).listen((_) {}, cancelOnError: false);
|
}).listen((_) {}, cancelOnError: false);
|
||||||
|
|
||||||
log.info('start');
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -95,8 +95,7 @@ class AudioControl extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||||||
int get _sourceId => _ref.read(sourceIdProvider);
|
int get _sourceId => _ref.read(sourceIdProvider);
|
||||||
|
|
||||||
AudioControl(this._player, this._ref) {
|
AudioControl(this._player, this._ref) {
|
||||||
_player.playbackEventStream.listen(
|
_player.playbackEventStream.listen((PlaybackEvent event) {
|
||||||
(PlaybackEvent event) {
|
|
||||||
final playing = _player.playing;
|
final playing = _player.playing;
|
||||||
playbackState.add(playbackState.value.copyWith(
|
playbackState.add(playbackState.value.copyWith(
|
||||||
controls: [
|
controls: [
|
||||||
@ -121,10 +120,11 @@ class AudioControl extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||||||
bufferedPosition: _player.bufferedPosition,
|
bufferedPosition: _player.bufferedPosition,
|
||||||
queueIndex: event.currentIndex,
|
queueIndex: event.currentIndex,
|
||||||
));
|
));
|
||||||
},
|
});
|
||||||
onError: (e, st) => log.warning('Audio playback error', e, st),
|
|
||||||
cancelOnError: false,
|
_player.playbackEventStream.doOnError((e, st) async {
|
||||||
);
|
log.warning('playbackEventStream', e, st);
|
||||||
|
});
|
||||||
|
|
||||||
shuffleIndicies.listen((value) {
|
shuffleIndicies.listen((value) {
|
||||||
playbackState.add(playbackState.value.copyWith(
|
playbackState.add(playbackState.value.copyWith(
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:rxdart/rxdart.dart';
|
||||||
|
|
||||||
import '../database/database.dart';
|
import '../database/database.dart';
|
||||||
|
import '../log.dart';
|
||||||
import '../state/settings.dart';
|
import '../state/settings.dart';
|
||||||
|
|
||||||
abstract class BaseMusicSource {
|
abstract class BaseMusicSource {
|
||||||
@ -40,25 +42,33 @@ class MusicSource implements BaseMusicSource {
|
|||||||
@override
|
@override
|
||||||
Stream<Iterable<AlbumsCompanion>> allAlbums() {
|
Stream<Iterable<AlbumsCompanion>> allAlbums() {
|
||||||
_testOnline();
|
_testOnline();
|
||||||
return _source.allAlbums();
|
return _source
|
||||||
|
.allAlbums()
|
||||||
|
.doOnError((e, st) => log.severe('allAlbums', e, st));
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream<Iterable<ArtistsCompanion>> allArtists() {
|
Stream<Iterable<ArtistsCompanion>> allArtists() {
|
||||||
_testOnline();
|
_testOnline();
|
||||||
return _source.allArtists();
|
return _source
|
||||||
|
.allArtists()
|
||||||
|
.doOnError((e, st) => log.severe('allArtists', e, st));
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream<Iterable<PlaylistWithSongsCompanion>> allPlaylists() {
|
Stream<Iterable<PlaylistWithSongsCompanion>> allPlaylists() {
|
||||||
_testOnline();
|
_testOnline();
|
||||||
return _source.allPlaylists();
|
return _source
|
||||||
|
.allPlaylists()
|
||||||
|
.doOnError((e, st) => log.severe('allPlaylists', e, st));
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream<Iterable<SongsCompanion>> allSongs() {
|
Stream<Iterable<SongsCompanion>> allSongs() {
|
||||||
_testOnline();
|
_testOnline();
|
||||||
return _source.allSongs();
|
return _source
|
||||||
|
.allSongs()
|
||||||
|
.doOnError((e, st) => log.severe('allSongs', e, st));
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user