Good lawd I did that in a hurry

Author: thebentern

meshtastic/__main__.py

@@ -465,17 +465,17 @@ def onConnected(interface):
         if args.backup_prefs:
             closeNow = True
             waitForAckNak = True
-            interface.getNode(args.dest, False, **getNode_kwargs).re(args.backup_preferences)
+            interface.getNode(args.dest, False, **getNode_kwargs).backup_preferences(args.backup_preferences)
 
         if args.restore_prefs:
             closeNow = True
             waitForAckNak = True
-            interface.getNode(args.dest, False, **getNode_kwargs).re(args.backup_preferences)
+            interface.getNode(args.dest, False, **getNode_kwargs).restore_prefs(args.restore_prefs)
 
         if args.remove_backup_prefs:
             closeNow = True
             waitForAckNak = True
-            interface.getNode(args.dest, False, **getNode_kwargs).re(args.remove_backup_preferences)
+            interface.getNode(args.dest, False, **getNode_kwargs).remove_backup_preferences(args.remove_backup_preferences)
 
         if args.set_ignored_node:
             closeNow = True

meshtastic/node.py

@@ -707,8 +707,9 @@ def setFavorite(self, nodeId: Union[int, str]):
             onResponse = self.onAckNak
         return self._sendAdmin(p, onResponse=onResponse)
 
-    def backupPreferences(self, location: Optional[int] = 0):
+    def backupPreferences(self, location: Optional[admin_pb2.AdminMessage.BackupLocation.ValueType] = 0):
         """Tell the node to backup preferences to flash."""
+        print(f"Backing up preferences to location {location}")
         self.ensureSessionKey()
 
         p = admin_pb2.AdminMessage()
@@ -720,7 +721,7 @@ def backupPreferences(self, location: Optional[int] = 0):
             onResponse = self.onAckNak
         return self._sendAdmin(p, onResponse=onResponse)
 
-    def restorePreferences(self, location: Optional[int] = 0):
+    def restorePreferences(self, location: Optional[admin_pb2.AdminMessage.BackupLocation.ValueType] = 0):
         """Tell the node to restore preferences from backup."""
         self.ensureSessionKey()
 
@@ -733,7 +734,7 @@ def restorePreferences(self, location: Optional[int] = 0):
             onResponse = self.onAckNak
         return self._sendAdmin(p, onResponse=onResponse)
 
-    def removePreferencesBackups(self, location: Optional[int] = 0):
+    def removePreferencesBackups(self, location: Optional[admin_pb2.AdminMessage.BackupLocation.ValueType] = 0):
         """Tell the node to remove backup preferences from the filesystem."""
         self.ensureSessionKey()
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meshtastic"
-version = "2.6.0"
+version = "2.6.0a1"
 description = "Python API & client shell for talking to Meshtastic devices"
 authors = ["Meshtastic Developers <[email protected]>"]
 license = "GPL-3.0-only"