use py2snes 1.0.2

Author: tcprescott

.gitignore

@@ -4,4 +4,5 @@ dist/
 src/test.py
 src/romloader.yaml
 env/
-.vscode/
+.vscode/
+testing/

requirements.txt

@@ -1,2 +1,2 @@
-websocket-client>=0.54.0
-PyYAML>=3.13
+PyYAML>=3.13
+py2snes>=1.0.2

romloader.example.yaml

@@ -10,7 +10,10 @@ default_destination: "/romloader"
 ### a set of rules to use to put certain ROMs in certain locations, such as your randomizer ROMs, useful for MSU1 users
 rules:
   alttpr:
-    name_pattern: "ALttP - VT_*" # look for an input ROM that matches this name
+    name_pattern:
+      - "ALttP - VT_*" # look for an input ROM that matches this name
+      - "ER_*"
+      - "Daily Challenge_*"
     destinations:
       - name: default
         path: "/LinkToThePast/Transferred"
@@ -36,22 +39,26 @@ rules:
         path: "/LinkToThePast/MSU1/ZeldaReOrchestrated"
         romname: alttp_msu.sfc
   smz3:
-    name_pattern: "SMALttP - sm-*"
+    name_pattern:
+      - "SMALttP - sm-*"
     destinations:
       - name: default
         path: "/smz3"
   smw:
-    name_pattern: "smw-*"
+    name_pattern:
+      - "smw-*"
     destinations:
       - name: default
         path: "/SuperMarioWorld/Rando"
   supermetroiditem:
-    name_pattern: "Item Randomizer *"
+    name_pattern:
+      - "Item Randomizer *"
     destinations:
       - name: default
         path: "/SuperMetroid/Rando"
   supermetroidvaria:
-    name_pattern: "VARIA_Randomizer_*"
+    name_pattern:
+      - "VARIA_Randomizer_*"
     destinations:
       - name: default
         path: "/SuperMetroid/Rando"

romloader.py

@@ -4,9 +4,9 @@
 from time import sleep
 
 import yaml
+import py2snes
 
-from py2snes import usb2snes
-from py2snes import usb2snesException
+import asyncio
 
 def show_exception_and_exit(exc_type, exc_value, tb):
     import traceback
@@ -24,6 +24,7 @@ def show_exception_and_exit(exc_type, exc_value, tb):
     with open(scriptpath + "\\romloader.yaml") as configfile:
         try:
             config = yaml.load(configfile)
+            print("loading config file at " + os.path.abspath(scriptpath + "\\romloader.yaml"))
         except yaml.YAMLError as e:
             print(e)
             sys.exit(1)
@@ -32,22 +33,20 @@ def show_exception_and_exit(exc_type, exc_value, tb):
         with open("romloader.yaml") as configfile:
             try:
                 config = yaml.load(configfile)
+                print("loading config file at " + os.path.abspath("romloader.yaml"))
             except yaml.YAMLError as e:
                 print(e)
                 sys.exit(1)
     except FileNotFoundError:
         config = {"default_destination": '/romloader'}
 
 
-def main():
+async def main():
     try:
         rompath = sys.argv[1]
     except IndexError:
-        try:
-            rompath = config['debug_copypath']
-        except:
-            raise IndexError('We need a path to the ROM file to load.')
-            sys.exit(1)
+        raise Exception('We need a path to the ROM file to load.')
+        sys.exit(1)
     filename = os.path.basename(rompath)
 
     rule = matchrule(filename)
@@ -73,59 +72,48 @@ def main():
             path = '/romloader'
         romname = filename
 
-    for a in range(10):
-        try:
-            # initiate connection to the websocket server
-            conn = usb2snes()
-
-            devicelist = conn.DeviceList()
-
-            # Attach to usb2snes, use the device configured if it is set, otherwise
-            # have it find the first device.
-            if "device" in config:
-                print('Attaching to specified device {device}'.format(
-                    device=config['device']
-                ))
-                com = conn.Attach(config['device'])
-            elif len(devicelist) > 1:
-                com = conn.Attach(get_comm_device(devicelist))
-            else:
-                print('Attaching to first device found.')
-                com = conn.Attach()
-            print('Attached to device \"{com}\"'.format(
-                com=com
-            ))
-
-            conn.Name('RomLoader')
-            if not rule:
-                conn.MakeDir('/romloader')
-            conn.List(path)
-            print("copying rom to {fullpath}".format(
-                fullpath=path + '/' + romname
-            ))
-            conn.PutFile(rompath, path + '/' + romname)
-            print("verifying rom copy is complete")
-            conn.List(path)
-            print("booting rom")
-            conn.Boot(path + '/' + romname)
-            conn.close()
-
-            sleep(5)
-            break
-        except KeyboardInterrupt:
-            break
-        except:
-            print("Unexpected error:", sys.exc_info()[0])
-            conn.close()
-            sleep(6)
-            continue
+    # initiate connection to the websocket server
+    snes = py2snes.snes()
+    await snes.connect()
+
+    devicelist = await snes.DeviceList()
+
+    # Attach to usb2snes, use the device configured if it is set, otherwise
+    # have it find the first device.
+    if "device" in config:
+        print('Attaching to specified device {device}'.format(
+            device=config['device']
+        ))
+        await snes.Attach(config['device'])
+    elif len(devicelist) > 1:
+        await snes.Attach(get_comm_device(devicelist))
+    else:
+        print('Attaching to first device found.')
+        await snes.Attach(devicelist[0])
+    print('Attached to device \"{com}\"'.format(
+        com=snes.device
+    ))
+
+    await snes.Name('RomLoader')
+    if not rule:
+        await snes.MakeDir('/romloader')
+    await snes.List(path)
+    print("copying rom to {fullpath}".format(
+        fullpath=path + '/' + romname
+    ))
+    await snes.PutFile(rompath, path + '/' + romname)
+    print("booting rom")
+    await snes.Boot(path + '/' + romname)
+
+    await asyncio.sleep(5)
 
 
 def matchrule(name):
     if "rules" in config:
         for rule in config['rules']:
-            if fnmatch.fnmatch(name, config['rules'][rule]['name_pattern']):
-                return rule
+            for pattern in config['rules'][rule]['name_pattern']:
+                if fnmatch.fnmatch(name, pattern):
+                    return rule
     else:
         return None
 
@@ -152,4 +140,6 @@ def get_comm_device(devicelist):
     dst_idx = int(input('What device? '))
     return devicelist[dst_idx]
 
-main()
+if __name__ == '__main__':
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main())

romloader.spec

@@ -2,7 +2,7 @@
 
 block_cipher = None
 
-a = Analysis(['src/romloader.py'],
+a = Analysis(['romloader.py'],
              pathex=['D:\\Code\\RomLoader'],
              binaries=[],
              datas=[],