 5e3c5dedf3
			
		
	
	5e3c5dedf3
	
	
	
		
			
			* Implement support for option groups. WebHost options pages still need to be updated. * Remove debug output * In-progress conversion of player-options to Jinja rendering * Support "Randomize" button without JS, transpile SCSS to CSS, include map file for later editors * Un-alphabetize options, add default group name for item/location Option classes, implement more option types * Re-flow UI generation to avoid printing rows with unsupported or invalid option types, add support for TextChoice options * Support all remaining option types * Rendering improvements and CSS fixes for prettiness * Wrap options in a form, update button styles, fix labels, disable inputs where the default is random, nuke the JS * Minor CSS tweaks, as recommended by the designer * Hide JS-required elements in noscript tag. Add JS reactivity to range, named-range, and randomize buttons. * Fix labels, add JS handling for TextChoice * Make option groups collapsable * PEP8 current option_groups progress (#2604) * Make the python more PEP8 and remove unneeded imports * remove LocationSet from `Item & Location Options` group * It's ugly, but YAML generation is working * Stop generating JSON files for player-options pages * Do not include ItemDict entries whose values are zero * Properly format yaml output * Save options when form is submitted, load options on page load * Fix options being omitted from the page if a group has an even number of options * Implement generate-game, escape option descriptions * Fix "randomize" checkboxes not properly setting YAML options to "random" * Add a separator between item/location groups and items/locations in their respective lists * Implement option presets * Fix docs to detail what actually ended up happening * implement option groups on webworld to allow dev sorting (#2616) * Force extremely long item/location/option names with no spaces to text-wrap * Fix "randomize" button being too wide in single-column display, change page header to include game name * Update preset select to read "custom" when updating form inputs. Show error message if the user doesn't input a name * Un-break weighted-options, add option group names to weighted options * Nuke weighted-options. Set up framework to rebuild it in Jinja. * Generate styles with scss, remove styles which will be replaced, add placeholders for worlds * Support Toggle, DefaultOnToggle, and Choice options in weighted-options * Implement expand/collapse without JS for worlds and option groups * Properly style set options * Implement Range and NamedRange. Also, CSS is hard. * Add support for remaining option types. JS and backend still forthcoming. * Add JS functionality for collapsing game divs, populating span values on range updates. Add <noscript> tag to warn users with JS disabled. * Support showing/hiding game divs based on range value for game * Add support for adding/deleting range rows * Save settings to localStorage on form submission * Save deleted options on form submission * Break weighted-options into a per-game page. - Break weighted-options into a per-game page - Add "advanced options" links to supported games page - Use details/summary tags on supported games, player-options, and weighted-options - Fix bug preventing previously deleted rows from being removed on page load if JS is enabled - Move route handling for options pages to options.py - Remove world handling from weighted-options * Implement loading previous settings from localStorage on page load if JS is enabled * Weighted options can now generate YAML files and single-player games * options pages now respect option visibility settings for simple and complex pages * Remove `/weighted-settings` redirect, fix weighted-options link on player-options page * Fix instance of AutoWorld not having access to proper `random` * Catch instances of frozenset along with set * Restore word-wrap in tooltips * Fix word wrap in player-options labels * Add `dedent` filter to help with formatting tooltips in player-options * Do not change the ordering of keys when printing yaml files * Move necessary import out of conditional statement * Expand only the first option group by default on both options pages * Respect option visibility when generating yaml template files * Swap to double quotes * Replace instances of `/weighted-settings` with `/weighted-options`, swap out incomplete links * Strip newlines and spaces after applying dedent filter * Fix documentation for option groups * Update site map * Update various docs * Sort OptionSet lists alphabetically * Minor style tweak * Fix extremely long text overflowing tooltips * Convert player-options to use CSS grid instead of tables * Do not display link to weighted-options page on supported games if the options page is an external link * Update worlds/AutoWorld.py Bugfix by @alwaysintreble Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Fix NamedRange options not being properly set if a preset it loaded * Move option-presets route into options.py * Include preset name in YAML if not "default" and not "custom" * Removed macros for PlandoBosses and DefaultOnToggle, as they were handled by their parent classes * Fix not disabling custom inputs when the randomize button is clicked * Only sort OptionList and OptionSet valid_keys if they are unordered * Quick style fixes for player-settings to give `select` elements `text-overflow: ellipsis` and increase base size of left-column * Prevent showing a horizontal scroll bar on player-options if the browser width was beneath a certain threshold * Fix a bug in weighted-options which prevented inputting a negative value for new range inputs --------- Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
		
			
				
	
	
		
			175 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			175 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| import datetime
 | |
| import os
 | |
| from typing import List, Dict, Union
 | |
| 
 | |
| import jinja2.exceptions
 | |
| from flask import request, redirect, url_for, render_template, Response, session, abort, send_from_directory
 | |
| from pony.orm import count, commit, db_session
 | |
| 
 | |
| from worlds.AutoWorld import AutoWorldRegister
 | |
| from . import app, cache
 | |
| from .models import Seed, Room, Command, UUID, uuid4
 | |
| 
 | |
| 
 | |
| def get_world_theme(game_name: str):
 | |
|     if game_name in AutoWorldRegister.world_types:
 | |
|         return AutoWorldRegister.world_types[game_name].web.theme
 | |
|     return 'grass'
 | |
| 
 | |
| 
 | |
| @app.before_request
 | |
| def register_session():
 | |
|     session.permanent = True  # technically 31 days after the last visit
 | |
|     if not session.get("_id", None):
 | |
|         session["_id"] = uuid4()  # uniquely identify each session without needing a login
 | |
| 
 | |
| 
 | |
| @app.errorhandler(404)
 | |
| @app.errorhandler(jinja2.exceptions.TemplateNotFound)
 | |
| def page_not_found(err):
 | |
|     return render_template('404.html'), 404
 | |
| 
 | |
| 
 | |
| # Start Playing Page
 | |
| @app.route('/start-playing')
 | |
| @cache.cached()
 | |
| def start_playing():
 | |
|     return render_template(f"startPlaying.html")
 | |
| 
 | |
| 
 | |
| # Game Info Pages
 | |
| @app.route('/games/<string:game>/info/<string:lang>')
 | |
| @cache.cached()
 | |
| def game_info(game, lang):
 | |
|     return render_template('gameInfo.html', game=game, lang=lang, theme=get_world_theme(game))
 | |
| 
 | |
| 
 | |
| # List of supported games
 | |
| @app.route('/games')
 | |
| @cache.cached()
 | |
| def games():
 | |
|     worlds = {}
 | |
|     for game, world in AutoWorldRegister.world_types.items():
 | |
|         if not world.hidden:
 | |
|             worlds[game] = world
 | |
|     return render_template("supportedGames.html", worlds=worlds)
 | |
| 
 | |
| 
 | |
| @app.route('/tutorial/<string:game>/<string:file>/<string:lang>')
 | |
| @cache.cached()
 | |
| def tutorial(game, file, lang):
 | |
|     return render_template("tutorial.html", game=game, file=file, lang=lang, theme=get_world_theme(game))
 | |
| 
 | |
| 
 | |
| @app.route('/tutorial/')
 | |
| @cache.cached()
 | |
| def tutorial_landing():
 | |
|     return render_template("tutorialLanding.html")
 | |
| 
 | |
| 
 | |
| @app.route('/faq/<string:lang>/')
 | |
| @cache.cached()
 | |
| def faq(lang):
 | |
|     return render_template("faq.html", lang=lang)
 | |
| 
 | |
| 
 | |
| @app.route('/glossary/<string:lang>/')
 | |
| @cache.cached()
 | |
| def terms(lang):
 | |
|     return render_template("glossary.html", lang=lang)
 | |
| 
 | |
| 
 | |
| @app.route('/seed/<suuid:seed>')
 | |
| def view_seed(seed: UUID):
 | |
|     seed = Seed.get(id=seed)
 | |
|     if not seed:
 | |
|         abort(404)
 | |
|     return render_template("viewSeed.html", seed=seed, slot_count=count(seed.slots))
 | |
| 
 | |
| 
 | |
| @app.route('/new_room/<suuid:seed>')
 | |
| def new_room(seed: UUID):
 | |
|     seed = Seed.get(id=seed)
 | |
|     if not seed:
 | |
|         abort(404)
 | |
|     room = Room(seed=seed, owner=session["_id"], tracker=uuid4())
 | |
|     commit()
 | |
|     return redirect(url_for("host_room", room=room.id))
 | |
| 
 | |
| 
 | |
| def _read_log(path: str):
 | |
|     if os.path.exists(path):
 | |
|         with open(path, encoding="utf-8-sig") as log:
 | |
|             yield from log
 | |
|     else:
 | |
|         yield f"Logfile {path} does not exist. " \
 | |
|               f"Likely a crash during spinup of multiworld instance or it is still spinning up."
 | |
| 
 | |
| 
 | |
| @app.route('/log/<suuid:room>')
 | |
| def display_log(room: UUID):
 | |
|     room = Room.get(id=room)
 | |
|     if room is None:
 | |
|         return abort(404)
 | |
|     if room.owner == session["_id"]:
 | |
|         file_path = os.path.join("logs", str(room.id) + ".txt")
 | |
|         if os.path.exists(file_path):
 | |
|             return Response(_read_log(file_path), mimetype="text/plain;charset=UTF-8")
 | |
|         return "Log File does not exist."
 | |
| 
 | |
|     return "Access Denied", 403
 | |
| 
 | |
| 
 | |
| @app.route('/room/<suuid:room>', methods=['GET', 'POST'])
 | |
| def host_room(room: UUID):
 | |
|     room: Room = Room.get(id=room)
 | |
|     if room is None:
 | |
|         return abort(404)
 | |
|     if request.method == "POST":
 | |
|         if room.owner == session["_id"]:
 | |
|             cmd = request.form["cmd"]
 | |
|             if cmd:
 | |
|                 Command(room=room, commandtext=cmd)
 | |
|                 commit()
 | |
|         return redirect(url_for("host_room", room=room.id))
 | |
| 
 | |
|     now = datetime.datetime.utcnow()
 | |
|     # indicate that the page should reload to get the assigned port
 | |
|     should_refresh = not room.last_port and now - room.creation_time < datetime.timedelta(seconds=3)
 | |
|     with db_session:
 | |
|         room.last_activity = now  # will trigger a spinup, if it's not already running
 | |
| 
 | |
|     return render_template("hostRoom.html", room=room, should_refresh=should_refresh)
 | |
| 
 | |
| 
 | |
| @app.route('/favicon.ico')
 | |
| def favicon():
 | |
|     return send_from_directory(os.path.join(app.root_path, "static", "static"),
 | |
|                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 | |
| 
 | |
| 
 | |
| @app.route('/discord')
 | |
| def discord():
 | |
|     return redirect("https://discord.gg/8Z65BR2")
 | |
| 
 | |
| 
 | |
| @app.route('/datapackage')
 | |
| @cache.cached()
 | |
| def get_datapackage():
 | |
|     """A pretty print version of /api/datapackage"""
 | |
|     from worlds import network_data_package
 | |
|     import json
 | |
|     return Response(json.dumps(network_data_package, indent=4), mimetype="text/plain")
 | |
| 
 | |
| 
 | |
| @app.route('/index')
 | |
| @app.route('/sitemap')
 | |
| @cache.cached()
 | |
| def get_sitemap():
 | |
|     available_games: List[Dict[str, Union[str, bool]]] = []
 | |
|     for game, world in AutoWorldRegister.world_types.items():
 | |
|         if not world.hidden:
 | |
|             has_settings: bool = isinstance(world.web.options_page, bool) and world.web.options_page
 | |
|             available_games.append({ 'title': game, 'has_settings': has_settings })
 | |
|     return render_template("siteMap.html", games=available_games)
 |