Pull request for #16

README.md

@@ -64,7 +64,7 @@ Here's an informal list of features to be added. If you're interested in helping
 - [-] Add unit tests
 - [ ] Finish Sheet Editor
   - [X] Add controls to add sheets
-  - [ ] Add controls to delete sheets
+  - [X] Add controls to delete sheets
   - [X] Add panel with buttons to append new rows
   - [X] Allow rows to be reordered
   - [X] Add "Delete" icon to delete a row
@@ -80,4 +80,4 @@ Here's an informal list of features to be added. If you're interested in helping
     - [ ] Shutdown and restore GraphQL subscriptions.
   - [ ] Need to verify that all error handling is done correctly (re: GraphQL connections)
 
-[^1]: This isn't entirely true. It uses a library that provides mDNS support and not all platforms are supported by it.
+[^1]: This isn't entirely true. It uses a library that provides mDNS support and not all platforms are supported by it.

build.yaml

@@ -4,8 +4,8 @@ targets:
       ferry_generator|serializer_builder:
         enabled: true
         options:
-          schema: drmem_browser|lib/schema/drmem.graphql
+          schema: drmem_browser|lib/pkg/drmem_provider/schema/drmem.graphql
       ferry_generator|graphql_builder:
         enabled: true
         options:
-          schema: drmem_browser|lib/schema/drmem.graphql
+          schema: drmem_browser|lib/pkg/drmem_provider/schema/drmem.graphql

lib/main.dart

@@ -3,14 +3,22 @@ import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:nsd/nsd.dart';
+import 'package:drmem_browser/pkg/drmem_provider/drmem_provider.dart';
 import 'package:drmem_browser/model/model.dart';
 import 'package:drmem_browser/theme/theme.dart';
 import 'mdns_chooser.dart';
 import 'node_details.dart';
 import 'param.dart';
 
+// The entry point for the application.
 Future<void> main() async {
+  // Make sure everything is initialized before starting up our persistent
+  // storage.
+
   WidgetsFlutterBinding.ensureInitialized();
+
+  // Initialize (and load) data associated with the persistent store.
+
   HydratedBloc.storage = await HydratedStorage.build(
       storageDirectory: await getApplicationDocumentsDirectory());
 
@@ -33,7 +41,7 @@ class DrMemApp extends StatelessWidget {
 
       home: BlocProvider(
         create: (_) => Model(),
-        child: const BaseWidget(),
+        child: DrMem(child: const BaseWidget()),
       ),
     );
   }
@@ -91,6 +99,10 @@ class BaseState extends State<BaseWidget> {
 
   @override
   Widget build(BuildContext context) {
+    final DrMem drmem = DrMem.of(context);
+
+    drmem.addNode("rpi4", "192.168.1.103", 3000, "/drmem/q", "/drmem/s");
+
     return Scaffold(
         body: SafeArea(child: _display(context)),
         bottomNavigationBar: _buildNavBar());

lib/mdns_chooser.dart

@@ -37,6 +37,7 @@ class ChooserState extends State<DnsChooser> {
       developer.log("unregistered", name: "mdns.announce");
       stopDiscovery(discovery!);
       developer.log("stopped", name: "mdns.connection");
+      discovery = null;
     }
     super.dispose();
   }

lib/node_details.dart

@@ -1,12 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gql_http_link/gql_http_link.dart';
-import 'schema/__generated__/driver_info.data.gql.dart';
-import 'schema/__generated__/driver_info.req.gql.dart';
-import 'schema/__generated__/get_all_devices.data.gql.dart';
-import 'schema/__generated__/get_all_devices.req.gql.dart';
-import 'package:ferry/ferry.dart';
+import 'package:drmem_browser/pkg/drmem_provider/drmem_provider.dart';
 import 'package:nsd/nsd.dart';
 import 'mdns_chooser.dart';
 
@@ -29,47 +24,6 @@ class _State extends State<_NodeInfo> {
       const EdgeInsets.only(top: 20.0, bottom: 8.0, left: 8.0);
   final EdgeInsets all8 = const EdgeInsets.all(8.0);
 
-  List<GAllDriversData_driverInfo>? drivers;
-  List<GGetAllDevicesData_deviceInfo>? devices;
-
-  // Build the URI to the GraphQL query endpoint.
-
-  late final queryLink = HttpLink(Uri(
-          scheme: "http",
-          host: widget.node.host,
-          port: widget.node.port,
-          path: propToString(widget.node, "queries"))
-      .toString());
-
-  final cache = Cache();
-
-  late final client = Client(link: queryLink, cache: cache);
-
-  @override
-  void initState() {
-    super.initState();
-
-    client.request(GAllDriversReq((b) => b)).listen((response) {
-      if (!response.loading) {
-        final List<GAllDriversData_driverInfo> tmp =
-            response.data?.driverInfo.toList() ?? [];
-
-        tmp.sort((a, b) => a.name.compareTo(b.name));
-        setState(() => drivers = tmp);
-      }
-    });
-
-    client.request(GGetAllDevicesReq((b) => b)).listen((response) {
-      if (!response.loading) {
-        final List<GGetAllDevicesData_deviceInfo> tmp =
-            response.data?.deviceInfo.toList() ?? [];
-
-        tmp.sort((a, b) => a.deviceName.compareTo(b.deviceName));
-        setState(() => devices = tmp);
-      }
-    });
-  }
-
   // Returns a widget that serves as a section header.
 
   Widget header(BuildContext context, String label) {
@@ -139,6 +93,8 @@ class _State extends State<_NodeInfo> {
 
   @override
   Widget build(BuildContext context) {
+    final DrMem drmem = DrMem.of(context);
+
     final Service info = widget.node;
     final DateTime? bootTime =
         DateTime.tryParse(propToString(info, "boot-time") ?? "");
@@ -174,13 +130,33 @@ class _State extends State<_NodeInfo> {
                   buildProperty(context, "subscriptions", gqlPropFlex,
                       propToString(info, "subscriptions")),
                   header(context, "Drivers"),
-                  drivers == null
-                      ? const Center(child: CircularProgressIndicator())
-                      : _DriversListView(drivers: drivers!),
+                  FutureBuilder(
+                    future: drmem.getDriverInfo("rpi4"),
+                    builder: (context, snapshot) {
+                      if (snapshot.hasData) {
+                        return _DriversListView(drivers: snapshot.data!);
+                      } else if (snapshot.hasError) {
+                        return const Icon(Icons.error_outline,
+                            color: Colors.red);
+                      } else {
+                        return const Center(child: CircularProgressIndicator());
+                      }
+                    },
+                  ),
                   header(context, "Devices"),
-                  devices == null
-                      ? const Center(child: CircularProgressIndicator())
-                      : _DevicesListView(devices: devices!),
+                  FutureBuilder(
+                    future: drmem.getDeviceInfo("rpi4", device: "*"),
+                    builder: (context, snapshot) {
+                      if (snapshot.hasData) {
+                        return _DevicesListView(devices: snapshot.data!);
+                      } else if (snapshot.hasError) {
+                        return const Icon(Icons.error_outline,
+                            color: Colors.red);
+                      } else {
+                        return const Center(child: CircularProgressIndicator());
+                      }
+                    },
+                  ),
                 ],
               ),
             ),
@@ -194,7 +170,7 @@ class _State extends State<_NodeInfo> {
 // Builds a row of driver information, including the Help button which brings
 // up a window containing the description text for the driver.
 
-Padding buildDrvInfoRow(GAllDriversData_driverInfo info, BuildContext context) {
+Padding buildDrvInfoRow(DriverInfo info, BuildContext context) {
   final ThemeData td = Theme.of(context);
 
   return Padding(
@@ -265,65 +241,49 @@ String makeDateChipContent(String label, DateTime dt) {
   return "$label: $year-$month-$day, $hour:$minute";
 }
 
-List<Widget> _buildChips(
-    BuildContext context, GGetAllDevicesData_deviceInfo info) {
+List<Widget> _buildChips(BuildContext context, DevInfo info) {
   final ThemeData td = Theme.of(context);
   final List<Widget> tmp = [
     _buildChip(td, info.settable ? "settable" : "read-only")
   ];
 
-  if (info.driver != null) {
-    tmp.add(_buildChip(td, "driver: ${info.driver!.name}"));
-  }
+  // TODO: Add this back in.
+  //
+  // if (info.driver != null) {
+  //   tmp.add(_buildChip(td, "driver: ${info.driver.name}"));
+  // }
 
   if (info.units != null) {
     tmp.add(_buildChip(td, "units: ${info.units}"));
   }
 
-  tmp.add(_buildChip(td, "points: ${info.history.totalPoints}"));
+  // If there's a "history" record with this device, add chips that display
+  // this information.
 
-  if (info.history.firstPoint != null) {
-    try {
-      final sTime =
-          DateTime.parse(info.history.firstPoint!.stamp.value).toLocal();
-
-      tmp.add(_buildChip(td, makeDateChipContent("oldest", sTime)));
-    } catch (e) {
-      // Ignore exceptions when parsing bad dates. We don't want the app to
-      // crash. Instead we'll just not display the chip.
-    }
-  }
-
-  if (info.history.lastPoint != null) {
-    try {
-      final eTime =
-          DateTime.parse(info.history.lastPoint!.stamp.value).toLocal();
-
-      tmp.add(_buildChip(td, makeDateChipContent("last", eTime)));
-    } catch (e) {
-      // Ignore exceptions when parsing bad dates. We don't want the app to
-      // crash. Instead we'll just not display the chip.
-    }
+  if (info.history != null) {
+    tmp.add(_buildChip(td, "points: ${info.history!.totalPoints}"));
+    tmp.add(_buildChip(
+        td, makeDateChipContent("oldest", info.history!.oldest.stamp)));
+    tmp.add(_buildChip(
+        td, makeDateChipContent("last", info.history!.newest.stamp)));
   }
 
   return tmp;
 }
 
-Padding buildDevInfoRow(
-    GGetAllDevicesData_deviceInfo info, BuildContext context) {
+Padding buildDevInfoRow(DevInfo info, BuildContext context) {
   return Padding(
     padding: const EdgeInsets.only(left: 20.0, bottom: 16.0),
     child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
       SizedBox(
         width: double.infinity,
         child: GestureDetector(
           onDoubleTap: () {
-            Future.wait(
-                [Clipboard.setData(ClipboardData(text: info.deviceName))]);
-            ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                content: Text("Added ${info.deviceName} to clipboard")));
+            Future.wait([Clipboard.setData(ClipboardData(text: info.name))]);
+            ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text("Added ${info.name} to clipboard")));
           },
-          child: Text(info.deviceName,
+          child: Text(info.name,
               textAlign: TextAlign.start,
               overflow: TextOverflow.ellipsis,
               style: TextStyle(color: Theme.of(context).colorScheme.primary)),
@@ -348,12 +308,9 @@ Padding buildDevInfoRow(
 // Local widget which displays a list of drivers.
 
 class _DriversListView extends StatelessWidget {
-  const _DriversListView({
-    Key? key,
-    required this.drivers,
-  }) : super(key: key);
+  final List<DriverInfo> drivers;
 
-  final List<GAllDriversData_driverInfo> drivers;
+  const _DriversListView({Key? key, required this.drivers}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -376,12 +333,9 @@ class _DriversListView extends StatelessWidget {
 // Local widget which displays a list of drivers.
 
 class _DevicesListView extends StatelessWidget {
-  const _DevicesListView({
-    Key? key,
-    required this.devices,
-  }) : super(key: key);
+  final List<DevInfo> devices;
 
-  final List<GGetAllDevicesData_deviceInfo> devices;
+  const _DevicesListView({Key? key, required this.devices}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {