Merge remote-tracking branch 'origin/master' into pull/122

ModuleUpdate.py

@@ -19,7 +19,7 @@ def update():
         update_ran = True
         path = os.path.join(os.path.dirname(sys.argv[0]), 'requirements.txt')
         if not os.path.exists(path):
-            os.path.join(os.path.dirname(__file__), 'requirements.txt')
+            path = os.path.join(os.path.dirname(__file__), 'requirements.txt')
         with open(path) as requirementsfile:
             for line in requirementsfile.readlines():
                 module, remote_version = line.split(">=")

MultiServer.py

@@ -647,7 +647,7 @@ class CommonCommandProcessor(CommandProcessor):
         for option in self.simple_options:
             self.output(f"Option {option} is set to {getattr(self.ctx, option)}")
 
-class ClientMessageProcessor(CommandProcessor):
+class ClientMessageProcessor(CommonCommandProcessor):
     marker = "!"
 
     def __init__(self, ctx: Context, client: Client):

Text.py

@@ -281,7 +281,6 @@ junk_texts = [
     "{C:GREEN}\nThe gnome asks\nyou to guess\nhis name.   >",
     "{C:GREEN}\nI heard beans\non toast is a\ngreat meal. >",
     "{C:GREEN}\n> Sweetcorn\non pizza is a\ngreat choice.",
-    "{C:GREEN}\n> race roms\ndon’t have\nspoiler logs",
     "{C:GREEN}\nI bet a nice\ncup of tea\nwould help! >",
     "{C:GREEN}\nI bet you\nexpected help,\ndidn't you? >",
     "{C:GREEN}\nLearn to make\nplogues, easy\nand yummy!  >",
@@ -297,7 +296,7 @@ junk_texts = [
     "{C:GREEN}\n>  READ\nor the owl\nwill eat you.",
     "{C:GREEN}\n> Bunnies\nare cute.",
     "{C:GREEN}\nPugs are the\nsuperior dog\nbreed.  >",
-    "{C:GREEN}\nYou are\nplaying\nALTTPR.    >",
+    "{C:GREEN}\nThis is\nBerserker's\nMultiworld.>",
     "{C:GREEN}\nOther randos\nexist too!\nTry some!  >",
 ]
 

WebHost.py

@@ -2,11 +2,11 @@ import os
 import multiprocessing
 import logging
 
-from WebHost import app as raw_app
+from WebHostLib import app as raw_app
 from waitress import serve
 
-from WebHost.models import db
-from WebHost.autolauncher import autohost
+from WebHostLib.models import db
+from WebHostLib.autolauncher import autohost
 
 configpath = "config.yaml"
 

WebHostLib/__init__.py

@@ -108,5 +108,5 @@ def host_room(room: UUID):
     return render_template("host_room.html", room=room)
 
 
-from WebHost.customserver import run_server_process
+from WebHostLib.customserver import run_server_process
 from . import tracker, upload, landing  # to trigger app routing picking up on it

WebHostLib/autolauncher.py

@@ -45,8 +45,8 @@ else:  # unix
 
     class Locker(CommonLocker):
         def __enter__(self):
-            self.fp = open(self.lockfile, "rb")
             try:
+                self.fp = open(self.lockfile, "wb")
                 fcntl.flock(self.fp.fileno(), fcntl.LOCK_EX)
             except OSError as e:
                 raise AlreadyRunningException() from e
@@ -72,6 +72,7 @@ def autohost(config: dict):
     def keep_running():
         try:
             with Locker("autohost"):
+                logging.info("Starting autohost service")
                 # db.bind(**config["PONY"])
                 # db.generate_mapping(check_tables=False)
                 while 1:

WebHostLib/customserver.py

@@ -20,7 +20,7 @@ from Utils import get_public_ipv4, get_public_ipv6
 class CustomClientMessageProcessor(ClientMessageProcessor):
     ctx: WebHostContext
     def _cmd_video(self, platform, user):
-        """Set a link for your name in the WebHost tracker pointing to a video stream"""
+        """Set a link for your name in the WebHostLib tracker pointing to a video stream"""
         if platform.lower().startswith("t"):  # twitch
             self.ctx.video[self.client.team, self.client.slot] = "Twitch", user
             self.ctx.save()
@@ -139,4 +139,4 @@ def run_server_process(room_id, ponyconfig: dict):
     asyncio.run(main())
 
 
-from WebHost import LOGS_FOLDER
+from WebHostLib import LOGS_FOLDER

WebHostLib/landing.py

@@ -1,5 +1,5 @@
 from flask import render_template
-from WebHost import app, cache
+from WebHostLib import app, cache
 
 
 @cache.memoize(timeout=300)

WebHostLib/requirements.txt

@@ -3,6 +3,4 @@ pony>=0.7.13
 waitress>=1.4.4
 flask-caching>=1.9.0
 Flask-Autoversion>=0.2.0
-Flask-Compress>=1.5.0
-redis>=3.5.3
-rq>=1.4.3
+Flask-Compress>=1.5.0

WebHostLib/tracker.py

@@ -7,7 +7,7 @@ import logging
 from uuid import UUID
 
 import Items
-from WebHost import app, cache, Room
+from WebHostLib import app, cache, Room
 
 
 def get_id(item_name):

WebHostLib/upload.py

@@ -6,7 +6,7 @@ import logging
 from flask import request, flash, redirect, url_for, session, render_template
 from pony.orm import commit, select
 
-from WebHost import app, allowed_file, Seed, Room, Patch
+from WebHostLib import app, allowed_file, Seed, Room, Patch
 
 accepted_zip_contents = {"patches": ".bmbp",
                          "spoiler": ".txt",

easy.yaml

@@ -185,9 +185,10 @@ timer:
 glitch_boots:
   on: 1 # enables that you start with Pegasus Boots in any glitched logic mode
   off: 0
-remote_items: # Warning: currently broken. Stores all your items on the server, effectively sending them to you as if another player picked it up
-  on: 0 # intended for racing, as the item information is missing from the ROM
-  off: 1
+door_shuffle: # Only available if the host uses the doors branch, it is ignored otherwise
+  vanilla: 1 # everything should be like in vanilla
+  basic: 0 # dungeons are shuffled within themselves.
+  crossed: 0 # dungeons are shuffled across each other.
 linked_options:
   - name: crosskeys
     options: # these overwrite earlier options if the percentage chance triggers