1 files changed, 26 insertions, 102 deletions

diff --git a/lib/level_selection.dart b/lib/level_selection.dart
index 5359d66..33d8c8b 100644
--- a/lib/level_selection.dart
+++ b/lib/level_selection.dart
@@ -1,10 +1,11 @@
 import 'dart:io';
 
-import 'package:esense_flutter/esense.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:sense_the_rhythm/esense_connect_dialog.dart';
+import 'package:sense_the_rhythm/esense_input.dart';
+import 'package:sense_the_rhythm/simfile.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'level.dart';
@@ -18,90 +19,14 @@ class LevelSelection extends StatefulWidget {
 
 class _LevelSelectionState extends State<LevelSelection> {
   String? stepmaniaCoursesPath;
-  List<FileSystemEntity> stepmaniaCoursesFolders = [];
-
-  String eSenseDeviceName = '';
-  ESenseManager? eSenseManager;
-  ValueNotifier<String> _deviceStatus = ValueNotifier('');
-  // String _deviceStatus = '';
-  bool connected = false;
-  bool sampling = false;
+  List<Simfile> stepmaniaCoursesFolders = [];
 
   @override
   void initState() {
     super.initState();
-    _listenToESense();
     loadFolderPath();
   }
 
-  Future<void> _askForPermissions() async {
-    if (!(await Permission.bluetoothScan.request().isGranted &&
-        await Permission.bluetoothConnect.request().isGranted)) {
-      print(
-          'WARNING - no permission to use Bluetooth granted. Cannot access eSense device.');
-    }
-    // for some strange reason, Android requires permission to location for Bluetooth to work.....?
-    if (Platform.isAndroid) {
-      if (!(await Permission.locationWhenInUse.request().isGranted)) {
-        print(
-            'WARNING - no permission to access location granted. Cannot access eSense device.');
-      }
-    }
-  }
-
-  Future<void> _listenToESense() async {
-    await _askForPermissions();
-
-    // if you want to get the connection events when connecting,
-    // set up the listener BEFORE connecting...
-    eSenseManager!.connectionEvents.listen((event) {
-      print('CONNECTION event: $event');
-
-      // when we're connected to the eSense device, we can start listening to events from it
-      // if (event.type == ConnectionType.connected) _listenToESenseEvents();
-
-      setState(() {
-        connected = false;
-        switch (event.type) {
-          case ConnectionType.connected:
-            _deviceStatus.value = 'connected';
-            connected = true;
-            break;
-          case ConnectionType.unknown:
-            _deviceStatus.value = 'unknown';
-            break;
-          case ConnectionType.disconnected:
-            _deviceStatus.value = 'disconnected';
-            sampling = false;
-            break;
-          case ConnectionType.device_found:
-            _deviceStatus.value = 'device_found';
-            break;
-          case ConnectionType.device_not_found:
-            _deviceStatus.value = 'device_not_found';
-            break;
-        }
-      });
-    });
-  }
-
-  Future<void> _connectToESense(String deviceName) async {
-    if (!connected) {
-      await _askForPermissions();
-      print('Trying to connect to eSense device...');
-      setState(() {
-        eSenseDeviceName = deviceName;
-      });
-      print(eSenseDeviceName);
-      eSenseManager = ESenseManager(eSenseDeviceName);
-      connected = await eSenseManager!.connect();
-      print('success!');
-
-      setState(() {
-        _deviceStatus.value = connected ? 'connecting...' : 'connection failed';
-      });
-    }
-  }
 
   Future<void> loadFolderPath() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -109,8 +34,9 @@ class _LevelSelectionState extends State<LevelSelection> {
         prefs.getString('stepmania_courses');
 
     if (stepmaniaCoursesPathSetting == null) return;
-    List<FileSystemEntity> stepmaniaCoursesFoldersFuture = await listFilesAndFolders(stepmaniaCoursesPathSetting);
-    
+    List<Simfile> stepmaniaCoursesFoldersFuture =
+        await listFilesAndFolders(stepmaniaCoursesPathSetting);
+
     setState(() {
       stepmaniaCoursesPath = stepmaniaCoursesPathSetting;
       stepmaniaCoursesFolders = stepmaniaCoursesFoldersFuture;
@@ -118,6 +44,7 @@ class _LevelSelectionState extends State<LevelSelection> {
   }
 
   Future<void> selectFolder() async {
+    await Permission.manageExternalStorage.request();
     String? selectedFolder = await FilePicker.platform.getDirectoryPath();
 
     if (selectedFolder != null) {
@@ -129,15 +56,21 @@ class _LevelSelectionState extends State<LevelSelection> {
     }
   }
 
-  Future<List<FileSystemEntity>> listFilesAndFolders(
-      String directoryPath) async {
+  Future<List<Simfile>> listFilesAndFolders(String directoryPath) async {
     final directory = Directory(directoryPath);
     try {
       // List all files and folders in the directory
-      return directory
+      List<Simfile> simfiles = directory
           .listSync()
           .where((entity) => FileSystemEntity.isDirectorySync(entity.path))
-          .toList();
+          .map((entity) {
+        Simfile simfile = Simfile(entity.path);
+        simfile.load();
+        return simfile;
+      }).toList();
+      simfiles.sort((a,b) => a.tags['TITLE']!.compareTo(b.tags['TITLE']!));
+
+      return simfiles;
     } catch (e) {
       print("Error reading directory: $e");
       return [];
@@ -155,10 +88,10 @@ class _LevelSelectionState extends State<LevelSelection> {
                     context: context,
                     builder: (BuildContext context) {
                       return ESenseConnectDialog(
-                        deviceStatus: _deviceStatus,
-                        connect: (String name) {
-                          _connectToESense(name);
-                        });
+                          deviceStatus: ESenseInput.instance.deviceStatus,
+                          connect: (String name) {
+                            ESenseInput.instance.connectToESense(name);
+                          });
                     },
                   ),
               icon: const Icon(Icons.bluetooth))
@@ -176,26 +109,17 @@ class _LevelSelectionState extends State<LevelSelection> {
             separatorBuilder: (BuildContext context, int index) =>
                 const Divider(),
             itemBuilder: (context, index) {
-              String thumbnailPath = Directory(
-                      stepmaniaCoursesFolders[index].path)
-                  .listSync()
-                  .firstWhere(
-                      (file) => file.path.toLowerCase().endsWith('banner.png'),
-                      orElse: () => File(''))
-                  .path;
               return ListTile(
-                leading: Image.file(File(thumbnailPath)),
+                leading: Image.file(
+                    File(stepmaniaCoursesFolders[index].bannerPath!)),
                 trailing: Icon(Icons.play_arrow),
-                title:
-                    Text(stepmaniaCoursesFolders[index].path.split('/').last),
+                title: Text(stepmaniaCoursesFolders[index].tags["TITLE"]!),
                 subtitle: Text('3:45'),
                 onTap: () => Navigator.push(
                     context,
                     MaterialPageRoute(
-                        builder: (BuildContext context) => Level(
-                              stepmaniaFolderPath:
-                                  stepmaniaCoursesFolders[index].path,
-                            ))),
+                        builder: (BuildContext context) =>
+                            Level(stepmaniaCoursesFolders[index]))),
               );
             },
           );