From 95ca6bcfc9c20ca1ba603caf210239bde3359a6c Mon Sep 17 00:00:00 2001 From: moli765 <86140402+moli765@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:19:54 +0800 Subject: [PATCH] reslove issue 717 about logo url and add coreelec support (#718) --- lib/data/model/app/shell_func.dart | 2 +- lib/data/model/pkg/manager.dart | 1 + lib/data/model/server/dist.dart | 1 + lib/view/page/server/detail/view.dart | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/data/model/app/shell_func.dart b/lib/data/model/app/shell_func.dart index bb5b8392..7032aecd 100644 --- a/lib/data/model/app/shell_func.dart +++ b/lib/data/model/app/shell_func.dart @@ -209,7 +209,7 @@ enum StatusCmdType { echo._('echo ${SystemType.linuxSign}'), time._('date +%s'), net._('cat /proc/net/dev'), - sys._('cat /etc/*-release | grep PRETTY_NAME'), + sys._('cat /etc/*-release | grep ^PRETTY_NAME'), cpu._('cat /proc/stat | grep cpu'), uptime._('uptime'), conn._('cat /proc/net/snmp'), diff --git a/lib/data/model/pkg/manager.dart b/lib/data/model/pkg/manager.dart index bf2bd278..32abb3b4 100644 --- a/lib/data/model/pkg/manager.dart +++ b/lib/data/model/pkg/manager.dart @@ -105,6 +105,7 @@ enum PkgManager { return PkgManager.apt; case Dist.opensuse: return PkgManager.zypper; + case Dist.coreelec: case Dist.wrt: return PkgManager.opkg; case Dist.arch: diff --git a/lib/data/model/server/dist.dart b/lib/data/model/server/dist.dart index e5d58b9c..515228b1 100644 --- a/lib/data/model/server/dist.dart +++ b/lib/data/model/server/dist.dart @@ -11,6 +11,7 @@ enum Dist { alpine, rocky, deepin, + coreelec, ; } diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index 81f28eb8..2bf5f6f0 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -161,7 +161,7 @@ class _ServerDetailPageState extends State if (logoUrl == null) return UIs.placeholder; final dist = si.status.more[StatusCmdType.sys]?.dist; - if (dist == null) return UIs.placeholder; + if (dist == null && (logoUrl.contains('{DIST}') || logoUrl.contains('{BRIGHT}')) ) return UIs.placeholder; logoUrl = logoUrl .replaceFirst('{DIST}', dist.name)