rename: apt -> pkg

This commit is contained in:
lollipopkit
2023-01-26 16:19:09 +08:00
parent 96034f9487
commit 565bc8012a
7 changed files with 25 additions and 25 deletions

View File

@@ -24,14 +24,14 @@ class DropdownBtnItem {
} }
class ServerTabMenuItems { class ServerTabMenuItems {
static const List<DropdownBtnItem> firstItems = [sftp, snippet, apt, docker]; static const List<DropdownBtnItem> firstItems = [sftp, snippet, pkg, docker];
static const List<DropdownBtnItem> secondItems = [edit]; static const List<DropdownBtnItem> secondItems = [edit];
static const sftp = static const sftp =
DropdownBtnItem(text: 'SFTP', icon: Icons.insert_drive_file); DropdownBtnItem(text: 'SFTP', icon: Icons.insert_drive_file);
static const snippet = DropdownBtnItem(text: 'Snippet', icon: Icons.label); static const snippet = DropdownBtnItem(text: 'Snippet', icon: Icons.label);
static const apt = static const pkg =
DropdownBtnItem(text: 'Apt/Yum', icon: Icons.system_security_update); DropdownBtnItem(text: 'Pkg', icon: Icons.system_security_update);
static const docker = static const docker =
DropdownBtnItem(text: 'Docker', icon: Icons.view_agenda); DropdownBtnItem(text: 'Docker', icon: Icons.view_agenda);
static const edit = DropdownBtnItem(text: 'Edit', icon: Icons.edit); static const edit = DropdownBtnItem(text: 'Edit', icon: Icons.edit);

View File

@@ -7,13 +7,13 @@ import 'package:toolbox/core/extension/ssh_client.dart';
import 'package:toolbox/core/extension/stringx.dart'; import 'package:toolbox/core/extension/stringx.dart';
import 'package:toolbox/core/extension/uint8list.dart'; import 'package:toolbox/core/extension/uint8list.dart';
import 'package:toolbox/core/provider_base.dart'; import 'package:toolbox/core/provider_base.dart';
import 'package:toolbox/data/model/apt/upgrade_pkg_info.dart'; import 'package:toolbox/data/model/pkg/upgrade_info.dart';
import 'package:toolbox/data/model/server/dist.dart'; import 'package:toolbox/data/model/server/dist.dart';
enum _Type { apt, yum, dnf, zypper, pkg, pacman, opkg } enum _Type { apt, yum, dnf, zypper, pkg, pacman, opkg }
class AptProvider extends BusyProvider { class PkgProvider extends BusyProvider {
final logger = Logger('AptProvider'); final logger = Logger('PkgProvider');
SSHClient? client; SSHClient? client;
Dist? dist; Dist? dist;
@@ -30,7 +30,7 @@ class AptProvider extends BusyProvider {
String lastLog = ''; String lastLog = '';
bool isRequestingPwd = false; bool isRequestingPwd = false;
AptProvider(); PkgProvider();
Future<void> init( Future<void> init(
SSHClient client, SSHClient client,

View File

@@ -1,6 +1,6 @@
import 'package:get_it/get_it.dart'; import 'package:get_it/get_it.dart';
import 'package:toolbox/data/provider/app.dart'; import 'package:toolbox/data/provider/app.dart';
import 'package:toolbox/data/provider/apt.dart'; import 'package:toolbox/data/provider/pkg.dart';
import 'package:toolbox/data/provider/debug.dart'; import 'package:toolbox/data/provider/debug.dart';
import 'package:toolbox/data/provider/docker.dart'; import 'package:toolbox/data/provider/docker.dart';
import 'package:toolbox/data/provider/private_key.dart'; import 'package:toolbox/data/provider/private_key.dart';
@@ -22,7 +22,7 @@ void setupLocatorForServices() {
void setupLocatorForProviders() { void setupLocatorForProviders() {
locator.registerSingleton(AppProvider()); locator.registerSingleton(AppProvider());
locator.registerSingleton(AptProvider()); locator.registerSingleton(PkgProvider());
locator.registerSingleton(DebugProvider()); locator.registerSingleton(DebugProvider());
locator.registerSingleton(DockerProvider()); locator.registerSingleton(DockerProvider());
locator.registerSingleton(ServerProvider()); locator.registerSingleton(ServerProvider());

View File

@@ -11,7 +11,7 @@ import 'package:toolbox/data/model/server/private_key_info.dart';
import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/model/server/snippet.dart'; import 'package:toolbox/data/model/server/snippet.dart';
import 'package:toolbox/data/provider/app.dart'; import 'package:toolbox/data/provider/app.dart';
import 'package:toolbox/data/provider/apt.dart'; import 'package:toolbox/data/provider/pkg.dart';
import 'package:toolbox/data/provider/debug.dart'; import 'package:toolbox/data/provider/debug.dart';
import 'package:toolbox/data/provider/docker.dart'; import 'package:toolbox/data/provider/docker.dart';
import 'package:toolbox/data/provider/private_key.dart'; import 'package:toolbox/data/provider/private_key.dart';
@@ -96,7 +96,7 @@ Future<void> main() async {
MultiProvider( MultiProvider(
providers: [ providers: [
ChangeNotifierProvider(create: (_) => locator<AppProvider>()), ChangeNotifierProvider(create: (_) => locator<AppProvider>()),
ChangeNotifierProvider(create: (_) => locator<AptProvider>()), ChangeNotifierProvider(create: (_) => locator<PkgProvider>()),
ChangeNotifierProvider(create: (_) => locator<DebugProvider>()), ChangeNotifierProvider(create: (_) => locator<DebugProvider>()),
ChangeNotifierProvider(create: (_) => locator<DockerProvider>()), ChangeNotifierProvider(create: (_) => locator<DockerProvider>()),
ChangeNotifierProvider(create: (_) => locator<ServerProvider>()), ChangeNotifierProvider(create: (_) => locator<ServerProvider>()),

View File

@@ -1,10 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:toolbox/core/utils.dart'; import 'package:toolbox/core/utils.dart';
import 'package:toolbox/data/model/apt/upgrade_pkg_info.dart'; import 'package:toolbox/data/model/pkg/upgrade_info.dart';
import 'package:toolbox/data/model/server/dist.dart'; import 'package:toolbox/data/model/server/dist.dart';
import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/provider/apt.dart'; import 'package:toolbox/data/provider/pkg.dart';
import 'package:toolbox/data/provider/server.dart'; import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/font_style.dart'; import 'package:toolbox/data/res/font_style.dart';
import 'package:toolbox/data/res/url.dart'; import 'package:toolbox/data/res/url.dart';
@@ -15,22 +15,22 @@ import 'package:toolbox/view/widget/round_rect_card.dart';
import 'package:toolbox/view/widget/two_line_text.dart'; import 'package:toolbox/view/widget/two_line_text.dart';
import 'package:toolbox/view/widget/url_text.dart'; import 'package:toolbox/view/widget/url_text.dart';
class AptManagePage extends StatefulWidget { class PkgManagePage extends StatefulWidget {
const AptManagePage(this.spi, {Key? key}) : super(key: key); const PkgManagePage(this.spi, {Key? key}) : super(key: key);
final ServerPrivateInfo spi; final ServerPrivateInfo spi;
@override @override
_AptManagePageState createState() => _AptManagePageState(); _PkgManagePageState createState() => _PkgManagePageState();
} }
class _AptManagePageState extends State<AptManagePage> class _PkgManagePageState extends State<PkgManagePage>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
late MediaQueryData _media; late MediaQueryData _media;
final _scrollController = ScrollController(); final _scrollController = ScrollController();
final _scrollControllerUpdate = ScrollController(); final _scrollControllerUpdate = ScrollController();
final _textController = TextEditingController(); final _textController = TextEditingController();
final _aptProvider = locator<AptProvider>(); final _aptProvider = locator<PkgProvider>();
late S _s; late S _s;
@override @override
@@ -43,7 +43,7 @@ class _AptManagePageState extends State<AptManagePage>
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
locator<AptProvider>().clear(); locator<PkgProvider>().clear();
} }
@override @override
@@ -126,7 +126,7 @@ class _AptManagePageState extends State<AptManagePage>
centerTitle: true, centerTitle: true,
title: TwoLineText(up: 'Apt', down: widget.spi.name), title: TwoLineText(up: 'Apt', down: widget.spi.name),
), ),
body: Consumer<AptProvider>(builder: (_, apt, __) { body: Consumer<PkgProvider>(builder: (_, apt, __) {
if (apt.error != null) { if (apt.error != null) {
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@@ -193,7 +193,7 @@ class _AptManagePageState extends State<AptManagePage>
); );
} }
Widget _buildUpdatePanel(AptProvider apt) { Widget _buildUpdatePanel(PkgProvider apt) {
if (apt.upgradeable!.isEmpty) { if (apt.upgradeable!.isEmpty) {
return ListTile( return ListTile(
title: Text( title: Text(
@@ -249,7 +249,7 @@ class _AptManagePageState extends State<AptManagePage>
); );
} }
Widget _buildUpdateItem(UpgradePkgInfo info, AptProvider apt) { Widget _buildUpdateItem(UpgradePkgInfo info, PkgProvider apt) {
return ListTile( return ListTile(
title: Text(info.package), title: Text(info.package),
subtitle: Text( subtitle: Text(

View File

@@ -13,7 +13,7 @@ import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/color.dart'; import 'package:toolbox/data/res/color.dart';
import 'package:toolbox/generated/l10n.dart'; import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart'; import 'package:toolbox/locator.dart';
import 'package:toolbox/view/page/apt.dart'; import 'package:toolbox/view/page/pkg.dart';
import 'package:toolbox/view/page/docker.dart'; import 'package:toolbox/view/page/docker.dart';
import 'package:toolbox/view/page/server/detail.dart'; import 'package:toolbox/view/page/server/detail.dart';
import 'package:toolbox/view/page/server/edit.dart'; import 'package:toolbox/view/page/server/edit.dart';
@@ -211,8 +211,8 @@ class _ServerPageState extends State<ServerPage>
onSelected: (value) { onSelected: (value) {
final item = value as DropdownBtnItem; final item = value as DropdownBtnItem;
switch (item) { switch (item) {
case ServerTabMenuItems.apt: case ServerTabMenuItems.pkg:
AppRoute(AptManagePage(spi), 'apt manage').go(context); AppRoute(PkgManagePage(spi), 'pkg manage').go(context);
break; break;
case ServerTabMenuItems.sftp: case ServerTabMenuItems.sftp:
AppRoute(SFTPPage(spi), 'SFTP').go(context); AppRoute(SFTPPage(spi), 'SFTP').go(context);