aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2026-02-20 15:15:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: custom server logo

Browse Source
This commit is contained in:
lollipopkit
2024-05-09 17:08:37 +08:00
parent 91a9d5aab5
commit 4d2a944310
10 changed files with 140 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/data/model/server/custom.dart
View File

@@ -16,6 +16,8 @@ final class ServerCustom {
final Map<String, String>? cmds;
@HiveField(4)
final String? preferTempDev;
@HiveField(5)
final String? logoUrl;
const ServerCustom({
//this.temperature,
@@ -23,6 +25,7 @@ final class ServerCustom {
this.pveIgnoreCert = false,
this.cmds,
this.preferTempDev,
this.logoUrl,
});
static ServerCustom fromJson(Map<String, dynamic> json) {
@@ -31,12 +34,14 @@ final class ServerCustom {
final pveIgnoreCert = json["pveIgnoreCert"] as bool;
final cmds = json["cmds"] as Map<String, dynamic>?;
final preferTempDev = json["preferTempDev"] as String?;
final logoUrl = json["logoUrl"] as String?;
return ServerCustom(
//temperature: temperature,
pveAddr: pveAddr,
pveIgnoreCert: pveIgnoreCert,
cmds: cmds?.cast<String, String>(),
preferTempDev: preferTempDev,
logoUrl: logoUrl,
);
}
@@ -56,6 +61,9 @@ final class ServerCustom {
if (preferTempDev != null) {
json["preferTempDev"] = preferTempDev;
}
if (logoUrl != null) {
json["logoUrl"] = logoUrl;
}
return json;
}
@@ -71,9 +79,16 @@ final class ServerCustom {
other.pveAddr == pveAddr &&
other.pveIgnoreCert == pveIgnoreCert &&
other.cmds == cmds &&
other.preferTempDev == preferTempDev;
other.preferTempDev == preferTempDev &&
other.logoUrl == logoUrl;
}
@override
int get hashCode => toString().hashCode;
int get hashCode =>
//temperature.hashCode ^
pveAddr.hashCode ^
pveIgnoreCert.hashCode ^
cmds.hashCode ^
preferTempDev.hashCode ^
logoUrl.hashCode;
}

7
lib/data/model/server/custom.g.dart
View File

@@ -21,13 +21,14 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
pveIgnoreCert: fields[2] == null ? false : fields[2] as bool,
cmds: (fields[3] as Map?)?.cast<String, String>(),
preferTempDev: fields[4] as String?,
logoUrl: fields[5] as String?,
);
}
@override
void write(BinaryWriter writer, ServerCustom obj) {
writer
..writeByte(4)
..writeByte(5)
..writeByte(1)
..write(obj.pveAddr)
..writeByte(2)
@@ -35,7 +36,9 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
..writeByte(3)
..write(obj.cmds)
..writeByte(4)
..write(obj.preferTempDev);
..write(obj.preferTempDev)
..writeByte(5)
..write(obj.logoUrl);
}
@override

12
lib/data/model/server/server.dart
View File

@@ -22,12 +22,12 @@ class Server implements TagPickable {
ServerPrivateInfo spi;
ServerStatus status;
SSHClient? client;
ServerState state;
ServerConn conn;
Server(
this.spi,
this.status,
this.state, {
this.conn, {
this.client,
});
@@ -39,9 +39,9 @@ class Server implements TagPickable {
@override
String get tagName => spi.id;
bool get needGenClient => state < ServerState.connecting;
bool get needGenClient => conn < ServerConn.connecting;
bool get canViewDetails => state == ServerState.finished;
bool get canViewDetails => conn == ServerConn.finished;
String get id => spi.id;
}
@@ -80,7 +80,7 @@ class ServerStatus {
});
}
enum ServerState {
enum ServerConn {
failed,
disconnected,
connecting,
@@ -94,5 +94,5 @@ enum ServerState {
/// Status parsing finished
finished;
operator <(ServerState other) => index < other.index;
operator <(ServerConn other) => index < other.index;
}

14
lib/data/model/server/server.ext.dart
View File

@@ -2,10 +2,10 @@ part of 'server.dart';
extension ServerX on Server {
String getTopRightStr(ServerPrivateInfo spi) {
switch (state) {
case ServerState.disconnected:
switch (conn) {
case ServerConn.disconnected:
return l10n.disconnected;
case ServerState.finished:
case ServerConn.finished:
// Highest priority of temperature display
final cmdTemp = () {
final val = status.customCmds['server_card_top_right'];
@@ -46,13 +46,13 @@ extension ServerX on Server {
final str = items.where((e) => e != null && e.isNotEmpty).join(' | ');
if (str.isEmpty) return l10n.noResult;
return str;
case ServerState.loading:
case ServerConn.loading:
return l10n.serverTabLoading;
case ServerState.connected:
case ServerConn.connected:
return l10n.connected;
case ServerState.connecting:
case ServerConn.connecting:
return l10n.serverTabConnecting;
case ServerState.failed:
case ServerConn.failed:
return status.err ?? l10n.serverTabFailed;
}
}

48
lib/data/provider/server.dart
View File

@@ -52,7 +52,7 @@ class ServerProvider extends ChangeNotifier {
/// Issues #258
/// If not [shouldReconnect], then keep the old state.
if (originServer != null && !originServer.spi.shouldReconnect(spi)) {
newServer.state = originServer.state;
newServer.conn = originServer.conn;
}
_servers[spi.id] = newServer;
}
@@ -115,7 +115,7 @@ class ServerProvider extends ChangeNotifier {
}
Server genServer(ServerPrivateInfo spi) {
return Server(spi, InitStatus.status, ServerState.disconnected);
return Server(spi, InitStatus.status, ServerConn.disconnected);
}
/// if [spi] is specificed then only refresh this server
@@ -134,7 +134,7 @@ class ServerProvider extends ChangeNotifier {
Future<void> _connectFn(Server s, bool onlyFailed) async {
if (onlyFailed) {
if (s.state != ServerState.failed) return;
if (s.conn != ServerConn.failed) return;
TryLimiter.reset(s.spi.id);
}
@@ -144,7 +144,7 @@ class ServerProvider extends ChangeNotifier {
/// If no this, the server will only refresh once by clicking refresh button.
///
/// If [spi.autoConnect] is true, then refresh.
if (!(s.spi.autoConnect ?? true) && s.state == ServerState.disconnected) {
if (!(s.spi.autoConnect ?? true) && s.conn == ServerConn.disconnected) {
return;
}
return await _getData(s.spi);
@@ -174,7 +174,7 @@ class ServerProvider extends ChangeNotifier {
void setDisconnected() {
for (final s in _servers.values) {
s.state = ServerState.disconnected;
s.conn = ServerConn.disconnected;
}
//TryLimiter.clear();
notifyListeners();
@@ -251,8 +251,8 @@ class ServerProvider extends ChangeNotifier {
}
}
void _setServerState(Server s, ServerState ss) {
s.state = ss;
void _setServerState(Server s, ServerConn ss) {
s.conn = ss;
notifyListeners();
}
@@ -263,8 +263,8 @@ class ServerProvider extends ChangeNotifier {
if (s == null) return;
if (!TryLimiter.canTry(sid)) {
if (s.state != ServerState.failed) {
_setServerState(s, ServerState.failed);
if (s.conn != ServerConn.failed) {
_setServerState(s, ServerConn.failed);
}
return;
}
@@ -272,7 +272,7 @@ class ServerProvider extends ChangeNotifier {
s.status.err = null;
if (s.needGenClient || (s.client?.isClosed ?? true)) {
_setServerState(s, ServerState.connecting);
_setServerState(s, ServerConn.connecting);
try {
final time1 = DateTime.now();
@@ -291,14 +291,14 @@ class ServerProvider extends ChangeNotifier {
} catch (e) {
TryLimiter.inc(sid);
s.status.err = e.toString();
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
/// In order to keep privacy, print [spi.name] instead of [spi.id]
Loggers.app.warning('Connect to ${spi.name} failed', e);
return;
}
_setServerState(s, ServerState.connected);
_setServerState(s, ServerConn.connected);
// Write script to server
// by ssh
@@ -314,12 +314,12 @@ class ServerProvider extends ChangeNotifier {
} on SSHAuthAbortError catch (e) {
TryLimiter.inc(sid);
s.status.err = e.toString();
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
return;
} on SSHAuthFailError catch (e) {
TryLimiter.inc(sid);
s.status.err = e.toString();
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
return;
} catch (e) {
Loggers.app.warning('Write script to ${spi.name} by shell', e);
@@ -347,7 +347,7 @@ class ServerProvider extends ChangeNotifier {
} catch (e) {
TryLimiter.inc(sid);
s.status.err = e.toString();
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
Loggers.app.warning('Write script to ${spi.name} by sftp', e);
return;
} finally {
@@ -356,13 +356,13 @@ class ServerProvider extends ChangeNotifier {
}
}
if (s.state == ServerState.connecting) return;
if (s.conn == ServerConn.connecting) return;
/// Keep [finished] state, or the UI will be refreshed to [loading] state
/// instead of the '$Temp | $Uptime'.
/// eg: '32C | 7 days'
if (s.state != ServerState.finished) {
_setServerState(s, ServerState.loading);
if (s.conn != ServerConn.finished) {
_setServerState(s, ServerConn.loading);
}
List<String>? segments;
@@ -374,19 +374,19 @@ class ServerProvider extends ChangeNotifier {
if (raw == null || raw.isEmpty || segments == null || segments.isEmpty) {
if (Stores.setting.keepStatusWhenErr.fetch()) {
// Keep previous server status when err occurs
if (s.state != ServerState.failed && s.status.more.isNotEmpty) {
if (s.conn != ServerConn.failed && s.status.more.isNotEmpty) {
return;
}
}
TryLimiter.inc(sid);
s.status.err = 'Seperate segments failed, raw:\n$raw';
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
return;
}
} catch (e) {
TryLimiter.inc(sid);
s.status.err = e.toString();
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
Loggers.app.warning('Get status from ${spi.name} failed', e);
return;
}
@@ -399,7 +399,7 @@ class ServerProvider extends ChangeNotifier {
final actual = segments.length;
final err = 'Segments: expect $expected, got $actual, raw:\n\n$raw';
s.status.err = err;
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
return;
}
s.status.system = systemType;
@@ -419,13 +419,13 @@ class ServerProvider extends ChangeNotifier {
} catch (e, trace) {
TryLimiter.inc(sid);
s.status.err = 'Parse failed: $e\n\n$raw';
_setServerState(s, ServerState.failed);
_setServerState(s, ServerConn.failed);
Loggers.parse.warning('Server status', e, trace);
return;
}
/// Call this every time for setting [Server.isBusy] to false
_setServerState(s, ServerState.finished);
_setServerState(s, ServerConn.finished);
// reset try times only after prepared successfully
TryLimiter.reset(sid);
}