LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Lertsenem   
+Copyright (c) 2020 Lertsenem
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.adoc

@@ -55,7 +55,7 @@ them for you and rename them according to lokrez expectations. Use it with
 +lokrez init ssbu+. Then you can go make yourself a cup of coffee or two,
 because that's about 3G you're going to download.
 
-By default, the images are 
+By default, the images are
 
 For reference, the images names look like :
 

lokrez/__init__.py

@@ -1,10 +1,13 @@
 import argparse
 import configparser
+import copy
 import datetime
 import html
+import io
 import json
 import logging
 import pathlib
+import pprint
 import requests
 import sys
 import urllib
@@ -16,6 +19,8 @@ from . import resources
 from . import smashgg
 from . import version
 
+from .games import ssbu, pplus, melee
+
 # =============================================================================
 __version__ = version.__version__
 __license__ = version.__license__
@@ -30,6 +35,62 @@ LOG_DUMMY.addHandler(logging.NullHandler())
 DEFAULT_DIR_TEMPLATES = ROOTDIR / "templates"
 
 # =============================================================================
+class StoreOptionKeyPair(argparse.Action):
+    def __init__(
+            self,
+            option_strings,
+            dest,
+            nargs=1,
+            const=None,
+            default=None,
+            type=None,
+            choices=None,
+            required=False,
+            help=None,
+            metavar="KEY=VALUE",
+            ):
+
+        if nargs == 0:
+            raise ValueError(
+                    'nargs for append actions must be > 0; if arg '
+                    'strings are not supplying the value to append, '
+                    'the append const action may be more appropriate'
+                    )
+        if const is not None and nargs != '?':
+            raise ValueError('nargs must be %r to supply const' % '?')
+
+        super(StoreOptionKeyPair, self).__init__(
+                option_strings=option_strings,
+                dest=dest,
+                nargs=nargs,
+                const=const,
+                default=default,
+                type=type,
+                choices=choices,
+                required=required,
+                help=help,
+                metavar=metavar,
+                )
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        try:
+            options = getattr(namespace, self.dest)
+        except AttributeError:
+            options = {}
+
+        for kv in values:
+            try:
+                k,v = kv.split("=")
+            except ValueError:
+                k = kv
+                v = True
+
+            options[k] = v
+
+        setattr(namespace, self.dest, options)
+
+
+# =============================================================================
 def get_templates_list(
         dir_templates = DEFAULT_DIR_TEMPLATES,
         ):
@@ -46,6 +107,76 @@ def get_templates_list(
     return templates_list
 
 # =============================================================================
+def get_infos_from_file(
+        lkrz_file_path,
+        options = {},
+        outform = "dict",
+        log = LOG_DUMMY,
+        ):
+
+    if not lkrz_file_path.exists():
+        raise IOError( "lkrz file '{}' does not exist" \
+                .format(str(lkrz_file_path)) )
+
+    lkrz = configparser.ConfigParser()
+    lkrz.read(str(lkrz_file_path))
+
+    log.info("Loading data from '{}'".format(str(lkrz_file_path)))
+
+    if s in lkrz:
+        section = lkrz[s]
+        if s == "Tournament":
+            tournament = smashgg.Tournament(
+                    id = 0,
+                    name = section["name"],
+                    game = section["game"],
+                    slug = section["slug"],
+                    startAt = datetime.datetime.strptime(
+                        section["date"],
+                        "%Y-%m-%d %H:%M:%S",
+                        ),
+                    numEntrants = int(section["numEntrants"]),
+                    venueName = section["location"],
+                    ) \
+                            .clean_name(
+                                    options.get("name_seo_delimiter", None)
+                                    )
+
+        elif s.startswith("player "):
+            chars = {}
+            for char in section["characters"].split(","):
+                c = char.strip()
+                charname = c.split("_")[0]
+                charskin = c.split("_")[1].split(" ")[0]
+                charscore = float(c.split("(")[1].split(")")[0])
+
+                chars[(charname,charskin)] = charscore
+
+            player = smashgg.Player(
+                    id = 0,
+                    prefix = section["team"],
+                    gamerTag = section["tag"],
+                    placement = section["placement"],
+                    seeding = section["seeding"],
+                    twitterHandle = section["twitter"],
+                    chars = chars,
+                    )
+
+            top_players[player.gamerTag] = player
+
+    # Re-sort top players by their placement
+    top_players = sorted(
+            top_players.values(),
+            key = lambda p: p.placement,
+            )
+
+    return format_infos(
+            outform,
+            tournament,
+            top_players,
+            )
+
+# =============================================================================
 def get_infos_from_url(
         url,
         token,
@@ -64,24 +195,75 @@ def get_infos_from_url(
         raise ValueError("Unsupported outform")
 
     # -------------------------------------------------------------------------
+    tournament = None
+    event = None
+
+    # -------------------------------------------------------------------------
     if url_parsed.netloc == "smash.gg":
 
         if (url_parsed.path.split("/")[1] != "tournament"):
-            raise Exception("No tournament found in url {}".format(url_parsed.path.split("/")))
+            log.error("Incomplete URL '{}'".format(url))
+            raise Exception("No tournament found in url {}".format(url))
 
-        # Get infos from smash.gg and write the config file
-        tournament, top_players = getTournamentTop(
-                id_or_slug = url_parsed.path.split("/")[2],
-                get_prefixes = options.get("use_smashgg_prefixes", False),
-                top = top,
-                token = token,
-                proxy = proxy,
-                log = log,
-                )
+        try:
+            tournament = url_parsed.path.split("/")[2]
+        except:
+            log.error("Incomplete URL '{}'".format(url))
+            raise Exception("No tournament slug found in url {}".format(url))
 
-        if tournament is None or top_players is None:
-            log.error("Could not load data from smash.gg")
-            raise Exception("Could not load data from smash.gg")
+        try:
+            if (url_parsed.path.split("/")[3] == "event"):
+                event = url_parsed.path.split("/")[4]
+        except:
+            log.info("No event slug found in url")
+
+    # -------------------------------------------------------------------------
+    return get_infos_from_id_or_slug(
+            id_or_slug = tournament,
+            event_slug = event,
+            token = token,
+            options = options,
+            outform = outform,
+            top = top,
+            proxy = proxy,
+            log = log,
+            )
+
+# =============================================================================
+def get_infos_from_id_or_slug(
+        id_or_slug,
+        event_slug = None,
+        token = "",
+        options = [],
+        outform = "dict",
+        top = 8,
+        proxy = None,
+        log = LOG_DUMMY,
+        ):
+    # Get infos from smash.gg and write the config file
+    tournament, top_players = getTournamentTop(
+            id_or_slug = id_or_slug,
+            event_slug = event_slug,
+            import_options = options,
+            top = top,
+            token = token,
+            proxy = proxy,
+            log = log,
+            )
+
+    if tournament is None or top_players is None:
+        log.error("Could not load data from smash.gg")
+        raise Exception("Could not load data from smash.gg")
+
+    return format_infos(outform, tournament, top_players)
+
+
+# =============================================================================
+def format_infos(
+        outform,
+        tournament,
+        top_players,
+        ):
 
     # -------------------------------------------------------------------------
     if outform == "dict":
@@ -101,6 +283,41 @@ def get_infos_from_url(
                         )
 
 # =============================================================================
+def init_resources(
+        imgdir,
+        game,
+        source = None,
+        store_raw = False,
+        proxy = None,
+        log = LOG_DUMMY,
+        ):
+
+    # Create imgdir
+    imgdir.mkdir(parents=True, exist_ok=True)
+
+    # Start resources download according to game
+    if game in ssbu.GAME.list_names():
+        game = ssbu
+    elif game in melee.GAME.list_names():
+        game = melee
+    elif game in pplus.GAME.list_names():
+        game = pplus
+    else:
+        log.error("Unknown game '{}'".format(game))
+        return 1
+
+    resources.download_res(
+            dstdir = imgdir,
+            game = game,
+            source = source,
+            store_raw = store_raw,
+            proxy = proxy,
+            log = log,
+            )
+
+    return 0
+
+# =============================================================================
 def generate_pic(
         infos_or_lkrzfile = None,
         template = None,
@@ -112,12 +329,20 @@ def generate_pic(
         log = LOG_DUMMY,
         ):
 
+    if outform.startswith("."):
+        outform = outform[1:]
+
     if outform not in ["svg", "png"]:
         raise Exception("Unsupported outform")
 
     if type(infos_or_lkrzfile) == str:
-        # TODO : load lkrz as dict infos
-        raise NotImplementedError()
+        # load lkrz as dict infos
+        infos = get_infos_from_file(
+                lkrz_file_path = pathlib.Path(infos_or_lkrzfile),
+                options = options,
+                outform = "dict",
+                log = log,
+                )
     else:
         infos = infos_or_lkrzfile
 
@@ -136,7 +361,7 @@ def generate_pic(
                 ),
             "dir_res_ssbu": dir_res,
             "dir_template": str(dir_templates/template),
-            "options": options.get("template_options", []),
+            "options": options,
             }
 
     pic = export.generate_pic(
@@ -146,7 +371,7 @@ def generate_pic(
             outform,
             log = log,
             cachedir = dir_cache,
-            options = { "svg_embed_png": options.get("svg_embed_png",False) },
+            options = options,
             )
 
     if pic is None:
@@ -186,12 +411,25 @@ def main():
             )
 
     init_parser.add_argument(
+            "--source", "-s",
+            default = None,
+            choices = ["spriters", "smashlyon"],
+            help = "From where should the resources images be downloaded",
+            )
+
+    init_parser.add_argument(
             "--imgdir", "-ID",
             type = pathlib.Path,
             default = pathlib.Path(APPDIRS.user_data_dir) / "res",
             help = "The directory we should download the resources to",
             )
 
+    init_parser.add_argument(
+            "--raw", "-r",
+            action = "store_true",
+            help = "Download the raw zipfiles instead of extracting them",
+            )
+
     # -------------------------------------------------------------------------
     top8_parser = subparsers.add_parser(
             "top8",
@@ -201,13 +439,22 @@ def main():
     top8_parser.add_argument(
             "tournament",
             default = None,
-            help = "The tournament slug or id",
+            help = "The tournament url, slug or id",
             )
 
     top8_parser.add_argument(
             "--token", "-t",
             default = None,
-            help = "the authentication token to use",
+            help = "the authentication token to use ; needed if you're " \
+                   "generating the top8 from a smash.gg url",
+            )
+
+    top8_parser.add_argument(
+            "--playerskinsdb", "-P",
+            type = (lambda s: s if s.startswith("http") else pathlib.Path(s)),
+            default = ROOTDIR / "data" / "playerskinsdb.json",
+            help = "A JSON file path or url matching player tags, characters,"\
+                   " sponsors, and preferred skins",
             )
 
     top8_parser.add_argument(
@@ -218,13 +465,6 @@ def main():
                    "you specify an absolute path or a relative one.",
             )
     top8_parser.add_argument(
-            "--playerskinsdb", "-PD",
-            type = (lambda s: s if s.startswith("http") else pathlib.Path(s)),
-            default = ROOTDIR / "data" / "playerskinsdb.json",
-            help = "A JSON file path or url matching player tags, characters,"\
-                   " sponsors, and preferred skins",
-            )
-    top8_parser.add_argument(
             "--cachedir", "-CD",
             type = pathlib.Path,
             default = pathlib.Path(APPDIRS.user_cache_dir),
@@ -243,48 +483,44 @@ def main():
             help = "The local result template to use",
             )
     top8_parser.add_argument(
-            "--template-options", "-O",
-            action = "append",
-            default = [],
-            help = "Template-specific options",
+            "--template-options", "-TO",
+            nargs="+",
+            action = StoreOptionKeyPair,
+            default = {},
+            help = "Template-specific options (like 'covid' or 'animated')",
             )
     top8_parser.add_argument(
-            "--export-options", "-E",
-            action = "append",
-            default = [],
-            help = "Export options (like svg_embed_png)",
+            "--export-options", "-EO",
+            nargs="+",
+            action = StoreOptionKeyPair,
+            default = {},
+            help = "Export options (like 'svg_embed_png')",
             )
 
     top8_parser.add_argument(
-            "--lkrz-file", "-f",
-            type = pathlib.Path,
-            default = None,
-            help = "The lkrz file in which the results are stored ; if it " \
-                   "does not exist, one will be created from the smashgg data",
+            "--import-options", "-IO",
+            nargs="+",
+            action = StoreOptionKeyPair,
+            default = {},
+            help = "Import options (like 'use_smashgg_prefixes')",
             )
+
     top8_parser.add_argument(
             "--outfile", "-o",
             type = pathlib.Path,
             default = None,
             help = "The SVG or PNG local result file to output to ; if it's " \
-                   "not specified, it will use the tournament slug as name",
+                   "not specified, it will default to SVG and use the "       \
+                   "tournament slug as name ; if you're generating a "        \
+                   "localresult from a url, a LKRZ file with the same name "  \
+                   "will also be generated along the image file (unless you " \
+                   "use the --no-lkrz flag).",
             )
 
-    top8_parser.add_argument(
-            "--name-seo-delimiter",
-            default = None,
-            help = "A character that will delimit in a tournament name what " \
-                   "really is its name, and what's actually here for SEO "    \
-                   "purposes (example: in 'Cornismash #42 - Ultimate Weekly " \
-                   "Lyon', only the 'Cornismash #42' is the tournament name, "\
-                   "the rest is here to help find the tournament).",
-            )
-    top8_parser.add_argument(
-            "--use-smashgg-prefixes", "-P",
-            action = "store_true",
-            help = "Use the prefixes (sponsor, team, etc) set by players on " \
-                   "smash.gg for the tournament",
-                   )
+    parser.add_argument( "--no-lkrz", "-nl",
+                         default = False,
+                         action = "store_true",
+                         help = "Do not output a LKRZ file" )
 
     # -------------------------------------------------------------------------
     parser.add_argument( "--verbose", "-v",
@@ -321,26 +557,38 @@ def main():
 
     log.addHandler(log_handler_console)
 
+    # Print all arguments in debug
+    # -------------------------------------------------------------------------
+    log.debug( "Command arguments:\n{}".format( pprint.pformat(vars(args))) )
+
     # Print version if required
     # -------------------------------------------------------------------------
     if args.version:
         print(version.VERSION_NAME)
         return 0
 
+    # Check if command is recognized
     # -------------------------------------------------------------------------
     if args.command not in [ "init", "top8" ]:
         parser.print_help()
         return 1
 
+    # -- init
     # -------------------------------------------------------------------------
     if args.command == "init":
-        args.imgdir.mkdir(parents=True, exist_ok=True)
-        resources.download_res_ssbu(
-                dstdir = args.imgdir,
+
+        rv = init_resources(
+                imgdir = args.imgdir,
+                game = args.game,
+                source = args.source,
+                store_raw = args.raw,
                 proxy = args.proxy,
                 log = log,
                 )
-        return 0
+
+        return rv
+
+    # -- top8
     # -------------------------------------------------------------------------
     if args.command == "top8":
 
@@ -358,87 +606,58 @@ def main():
         #
         tournament = None
         top_players = {}
+        lkrz_file = None
 
-        if args.lkrz_file is not None and args.lkrz_file.exists():
-            lkrz = configparser.ConfigParser()
-            lkrz.read(str(args.lkrz_file))
-
-            log.info("Loading data from '{}'".format(args.lkrz_file))
-
-            for s in lkrz:
-                section = lkrz[s]
-                if s == "Tournament":
-                    tournament = smashgg.Tournament(
-                            id = 0,
-                            name = section["name"],
-                            slug = section["slug"],
-                            startAt = datetime.datetime.strptime(
-                                section["date"],
-                                "%Y-%m-%d %H:%M:%S",
-                                ),
-                            numEntrants = int(section["numEntrants"]),
-                            venueName = section["location"],
-                            )
-
-                elif s.startswith("player "):
-                    chars = {}
-                    for char in section["characters"].split(","):
-                        c = char.strip()
-                        charname = c.split("_")[0]
-                        charskin = c.split("_")[1].split(" ")[0]
-                        charscore = float(c.split("(")[1].split(")")[0])
-
-                        chars[(charname,charskin)] = charscore
-
-                    player = smashgg.Player(
-                            id = 0,
-                            prefix = section["team"],
-                            gamerTag = section["tag"],
-                            placement = section["placement"],
-                            seeding = section["seeding"],
-                            twitterHandle = section["twitter"],
-                            chars = chars,
-                            )
+        all_options = {
+                **args.import_options,
+                **args.template_options,
+                **args.export_options,
+                }
 
-                    top_players[player.gamerTag] = player
+        # Determine the nature of the 'tournament' argument :
+        # - url
+        # - id or slug
+        # - lkrz file
+        # url
+        if (    args.tournament.startswith("http://")
+             or args.tournament.startswith("https://") ):
+            infos = get_infos_from_url(
+                    url = args.tournament,
+                    token = args.token,
+                    options = args.import_options,
+                    outform = "dict",
+                    top = 8,
+                    proxy = args.proxy,
+                    log = log,
+                    )
 
-            # Re-sort top players by their placement
-            top_players = sorted(
-                    top_players.values(),
-                    key = lambda p: p.placement,
+        # lkrz file
+        elif pathlib.Path(args.tournament).exists():
+            infos = get_infos_from_file(
+                    lkrz_file_path = pathlib.Path(args.tournament),
+                    options = args.import_options,
+                    outform = "dict",
+                    log = log,
                     )
 
+        # id or slug
         else:
-
-            # Get infos from smash.gg and write the config file
-            tournament, top_players = getTournamentTop(
+            infos = get_infos_from_id_or_slug(
                     id_or_slug = args.tournament,
-                    get_prefixes = args.use_smashgg_prefixes,
-                    top = 8,
                     token = args.token,
+                    options = args.import_options,
+                    outform = "dict",
+                    top = 8,
                     proxy = args.proxy,
                     log = log,
                     )
 
-            if tournament is None or top_players is None:
-                log.error("Could not load data from smash.gg")
-                return 1
-
-            lkrz_data = "\n".join(
-                    [ tournament.conf() ] \
-                    + list(map(
-                        lambda p:p.conf(),
-                        top_players,
-                        ))
-                    )
+        tournament = infos["tournament"]
+        top_players = infos["players"]
 
-            if args.lkrz_file is None:
-                args.lkrz_file = pathlib.Path(
-                        "{}.lkrz".format(tournament.slug)
-                        )
-
-            with args.lkrz_file.open("w", encoding="utf8") as f:
-                f.write(lkrz_data)
+        if tournament is None or top_players is None:
+            log.error("Could not load data")
+            return 1
 
         # Default outfile is 'tournament-slug.svg'
         if args.outfile is None:
@@ -446,48 +665,60 @@ def main():
                     "{}.svg".format(tournament.slug),
                     )
 
-        # Build the context which will be passed to the template
+        # Save a lkrz file
+        if not args.no_lkrz:
+            lkrz_data = format_infos("lkrz", tournament, top_players)
+            lkrz_file = args.outfile.with_suffix(".lkrz")
+
+            with lkrz_file.open("w", encoding="utf8") as f:
+                f.write(lkrz_data)
+
+        # If the outfile we were asked for was a .lkrz, we're done
+        if args.outfile.suffix == ".lkrz":
+            return 0
+
+        # Otherwise, let's generate the picture file
+        # First build the context which will be passed to the template
         try:
-            dir_res_ssbu = args.imgdir.as_uri() # not absolute => error
+            dir_res = (args.imgdir / tournament.game.name).as_uri() # not absolute => error
         except ValueError:
-            dir_res_ssbu = args.imgdir.as_posix()
-
-        context = {
-                "tournament": tournament.clean_name(args.name_seo_delimiter),
-                "players" : sorted(
-                    top_players,
-                    key = lambda p: p.placement,
-                    ),
-                "dir_res_ssbu": dir_res_ssbu,
-                "dir_template": str(args.templatesdir / args.template),
-                "options": args.template_options,
-                }
-
-        rv = export.generate_outfile(
-                args.templatesdir,
-                args.template,
-                context,
-                args.outfile,
+            dir_res = (args.imgdir / tournament.game.name).as_posix()
+
+        pic = generate_pic(
+                infos_or_lkrzfile = infos,
+                template = args.template,
+                outform = args.outfile.suffix,
+                options = all_options,
+                dir_templates = args.templatesdir,
+                dir_res = dir_res,
+                dir_cache = args.cachedir,
                 log = log,
-                cachedir = args.cachedir,
-                options={"svg_embed_png": "svg_embed_png" in args.export_options},
                 )
 
-        if rv is None:
+        if pic is None:
             return 1
 
-        log.info("Successfully saved outfile as '{}'".format(rv))
+        log.info("Saving picture as '{}'".format(args.outfile))
+
+        if type(pic) == io.StringIO:
+            openmode = "w"
+        else:
+            openmode = "wb"
+        with args.outfile.open(openmode) as f:
+            f.write(pic.read())
 
         return 0
 
 # -----------------------------------------------------------------------------
 def getTournamentTop(
         id_or_slug,
-        get_prefixes = True,
+        event_slug = None,
+        import_options = [],
         top = 8,
         token = "",
         proxy = None,
-        log=LOG_DUMMY):
+        log=LOG_DUMMY,
+        ):
     """Returns a tuple : the smashgg.Tournament object and a list of the top
     smashgg.Player in that tournament."""
 
@@ -537,6 +768,36 @@ def getTournamentTop(
         return event
 
     # -------------------------------------------------------------------------
+    # Select the specified event
+    def selectEventBySlug(data, slug, log=LOG_DUMMY):
+
+        try:
+            event = data["events"][0]
+        except:
+            log.error("No event found in data")
+            log.debug(data)
+            return None
+
+        for e in data["events"]:
+            try:
+                slug_full = e["slug"]
+            except KeyError:
+                continue
+
+            if (    slug == slug_full
+                 or slug == slug_full.split("/")[-1] ):
+                log.info("Selected Event '{}' by slug '{}'" \
+                        .format(
+                            e["name"],
+                            slug,
+                            ))
+                return e
+
+
+        log.error("No Event matching slug '{}' found".format(slug))
+        return None
+
+    # -------------------------------------------------------------------------
     data = None
 
     try:
@@ -575,7 +836,11 @@ def getTournamentTop(
         log.error("Failed to load Tournament")
         return None,None
 
-    event = selectBiggestEvent(tournament_data, log)
+    event = None
+    if event_slug is None:
+        event = selectBiggestEvent(tournament_data, log)
+    else:
+        event = selectEventBySlug(tournament_data, event_slug, log)
 
     if event is None :
         return None,None
@@ -584,6 +849,7 @@ def getTournamentTop(
     tournament = smashgg.Tournament(
             id = tournament_data["id"],
             slug = tournament_data["slug"],
+            game = event["videogame"],
             name = tournament_data["name"],
             startAt = \
                     datetime.datetime. \
@@ -594,7 +860,10 @@ def getTournamentTop(
             city = tournament_data["city"],
             countryCode = tournament_data["countryCode"],
             hashtag = tournament_data["hashtag"],
-            )
+            ) \
+                    .clean_name(
+                            import_options.get("name_seo_delimiter", None)
+                            )
 
 
     # Get the top players
@@ -605,10 +874,16 @@ def getTournamentTop(
     for standing in standings :
 
         seeding = None
+        seeding32 = None
         for seed in standing["entrant"]["seeds"]:
             # Take the seeding from the phase with *all* Event entrants
             if seed["phase"]["numSeeds"] == tournament.numEntrants:
                 seeding = seed["groupSeedNum"]
+            if seed["phase"]["numSeeds"] == 32:
+                seeding32 = seed["groupSeedNum"]
+        if seeding is None:
+            log.info("no global seeding found, using top 32 seeding")
+            seeding = seeding32
 
         participant_data = standing["entrant"]["participants"][0]
 
@@ -619,10 +894,10 @@ def getTournamentTop(
                     ["authorizations"] \
                     [0] \
                     ["externalUsername"]
-        except TypeError:
+        except:
             twitterHandle = None
 
-        if get_prefixes:
+        if "use_smashgg_prefixes" in import_options:
             prefix = participant_data["prefix"]
         else:
             prefix = ""
@@ -664,7 +939,11 @@ def getTournamentTop(
         log.error("Failed to load Tournament")
         return None,None
 
-    event = selectBiggestEvent(tournament_data, log)
+    event = None
+    if event_slug is None:
+        event = selectBiggestEvent(tournament_data, log)
+    else:
+        event = selectEventBySlug(tournament_data, event_slug, log)
 
     if event is None :
         return None,None
@@ -684,6 +963,7 @@ def getTournamentTop(
                         eid = slct["entrant"]["id"]
                         try:
                             top_players[eid].add_character_selection(
+                                    game = tournament.game,
                                     character = slct["selectionValue"],
                                     win = (winnerId == eid),
                                     )

lokrez/challonge.py

@@ -4,7 +4,7 @@ import pathlib
 
 import requests
 
-from . import characters_ssbu
+from .games import ssbu
 
 # =============================================================================
 API_HOST = "api.challonge.com"
@@ -16,7 +16,7 @@ API_URL = "{scheme}://{host}/{endpoint}".format(
         endpoint = API_ENDPOINT,
         )
 
-CHARACTERS = { c.smashggid : c.name for c in characters_ssbu.EVERYONE }
+CHARACTERS = { c.smashggid : c.name for c in ssbu.EVERYONE }
 
 PLAYERSKINS = {}
 

lokrez/characters_ssbu.py

@@ -1,739 +0,0 @@
-# -------------------------------------------------------------------------
-class SSBUCharacter:
-    """Infos needed about an SSBU character"""
-    def __init__(
-            self,
-            name,
-            codename,
-            spritersurls,
-            smashggid = None,
-            ):
-        self.spritersurls = spritersurls
-        self.smashggid = smashggid
-        self.name = name
-        self.codename = codename
-        
-# -------------------------------------------------------------------------
-EVERYONE = [
-        SSBUCharacter(
-            smashggid = 1530,
-            name = "banjo & kazooie",
-            codename = "buddy",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/121027/",
-                ],
-            ),
-        SSBUCharacter(
-            smashggid = None,
-            name = "bayonetta",
-            codename = "bayonetta",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/111299/",
-                ],
-            ),
-        SSBUCharacter(
-            smashggid = 1272,
-            name = "bowser jr",
-            codename = "koopajr",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/111303/",
-                ],
-            ),
-        SSBUCharacter(
-            smashggid = 1273,
-            name = "bowser",
-            codename = "koopa",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/111302/",
-                ],
-            ),
-        SSBUCharacter(
-            smashggid = 1539,
-            name = "byleth",
-            codename = "master",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/125348/",
-                ],
-            ),
-        SSBUCharacter(
-            smashggid = 1274,
-            name = "captain falcon",
-            codename = "captain",
-            spritersurls = [
-                "https://www.spriters-resource.com/download/111304/"
-                ],
-            ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "charizard",
-                codename = "plizardon",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111351/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1409,
-                name = "chrom",
-                codename = "chrom",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111305/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1275,
-                name = "cloud",
-                codename = "cloud",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111306/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "corrin",
-                codename = "kamui",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111307/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1277,
-                name = "daisy",
-                codename = "daisy",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111308/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "dark pit",
-                codename = "pitb",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111309/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1279,
-                name = "diddy kong",
-                codename = "diddy",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111311/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1280,
-                name = "donkey kong",
-                codename = "donkey",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111312/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1282,
-                name = "dr mario",
-                codename = "mariod",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111313/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1283,
-                name = "duck hunt",
-                codename = "duckhunt",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111314/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1285,
-                name = "falco",
-                codename = "falco",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111315/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1286,
-                name = "fox",
-                codename = "fox",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111316/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1287,
-                name = "ganondorf",
-                codename = "ganon",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111317/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "greninja",
-                codename = "gekkouga",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111318/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1526,
-                name = "hero",
-                codename = "brave",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/119842/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1290,
-                name = "ice climbers",
-                codename = "ice_climber",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111319/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1291,
-                name = "ike",
-                codename = "ike",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111320/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1292,
-                name = "inkling",
-                codename = "inkling",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111322/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "ivysaur",
-                codename = "pfushigisou",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111352/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1293,
-                name = "jigglypuff",
-                codename = "purin",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111324/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1410,
-                name = "ken",
-                codename = "ken",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111325/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1294,
-                name = "king dedede",
-                codename = "dedede",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111326/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1295,
-                name = "kirby",
-                codename = "kirby",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111328/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1296,
-                name = "link",
-                codename = "link",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111329/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1297,
-                name = "little mac",
-                codename = "littlemac",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111330/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1298,
-                name = "lucario",
-                codename = "lucario",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111331/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1299,
-                name = "lucas",
-                codename = "lucas",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111332/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1300,
-                name = "lucina",
-                codename = "lucina",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111333/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1301,
-                name = "luigi",
-                codename = "luigi",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111334/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1302,
-                name = "mario",
-                codename = "mario",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111335/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "marth",
-                codename = "marth",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111336/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1305,
-                name = "mega man",
-                codename = "rockman",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111337/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1307,
-                name = "meta knight",
-                codename = "metaknight",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111338/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1310,
-                name = "mewtwo",
-                codename = "mewtwo",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111339/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "mii fighter",
-                codename = "miifighter",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111340/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1415,
-                name = "mii gunner",
-                codename = "miigunner",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111340/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "mii swordsman",
-                codename = "miiswordsman",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111340/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1313,
-                name = "ness",
-                codename = "ness",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111342/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1314,
-                name = "olimar",
-                codename = "pikmin",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111343/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1315,
-                name = "pacman",
-                codename = "pacman",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111344/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1316,
-                name = "palutena",
-                codename = "palutena",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111345/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1317,
-                name = "peach",
-                codename = "peach",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111346/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1318,
-                name = "pichu",
-                codename = "pichu",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111347/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1319,
-                name = "pikachu",
-                codename = "pikachu",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111348/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1320,
-                name = "pit",
-                codename = "pit",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111349/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1321,
-                name = "pokemon trainer",
-                codename = "ptrainer",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111350/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1412,
-                name = "richter",
-                codename = "richter",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111354/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1322,
-                name = "ridley",
-                codename = "ridley",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111355/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1323,
-                name = "rob",
-                codename = "robot",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111356/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1324,
-                name = "robin",
-                codename = "reflet",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111357/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1325,
-                name = "rosalina and luma",
-                codename = "rosetta",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111358/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1326,
-                name = "roy",
-                codename = "roy",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111359/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1327,
-                name = "ryu",
-                codename = "ryu",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111360/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1328,
-                name = "samus",
-                codename = "samus",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111361/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1329,
-                name = "sheik",
-                codename = "sheik",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111362/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1330,
-                name = "shulk",
-                codename = "shulk",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111363/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "simon",
-                codename = "simon",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111364/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1331,
-                name = "snake",
-                codename = "snake",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111365/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1332,
-                name = "sonic",
-                codename = "sonic",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111366/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "squirtle",
-                codename = "pzenigame",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111353/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1333,
-                name = "toon link",
-                codename = "toonlink",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111367/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1334,
-                name = "villager",
-                codename = "murabito",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111368/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1335,
-                name = "wario",
-                codename = "wario",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111369/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1336,
-                name = "wii fit trainer",
-                codename = "wiifit",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111370/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1337,
-                name = "wolf",
-                codename = "wolf",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111371/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1338,
-                name = "yoshi",
-                codename = "yoshi",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111372/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1339,
-                name = "young link",
-                codename = "younglink",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111373/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1340,
-                name = "zelda",
-                codename = "zelda",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111374/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1341,
-                name = "zero suit samus",
-                codename = "szerosuit",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111375/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1405,
-                name = "mr game and watch",
-                codename = "gamewatch",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111341/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1406,
-                name = "incineroar",
-                codename = "gaogaen",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111321/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1407,
-                name = "king k rool",
-                codename = "krool",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111327/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1408,
-                name = "dark samus",
-                codename = "samusd",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111310/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1413,
-                name = "isabelle",
-                codename = "shizue",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/111323/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1441,
-                name = "piranha plant",
-                codename = "packun",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/113440/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1453,
-                name = "joker",
-                codename = "jack",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/116168/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1532,
-                name = "terry",
-                codename = "dolly",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/123089/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1747,
-                name = "min min",
-                codename = "tantan",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/134242/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1766,
-                name = "steve",
-                codename = "pickel",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/140939/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = 1777,
-                name = "sephiroth",
-                codename = "edge",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/145102/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "pyra",
-                codename = "eflame_only",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/149626/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "pyra & mythra",
-                codename = "eflame_first",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/149627/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "mythra",
-                codename = "elight_only",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/149628/",
-                    ],
-                ),
-        SSBUCharacter(
-                smashggid = None,
-                name = "mythra & pyra",
-                codename = "elight_first",
-                spritersurls = [
-                    "https://www.spriters-resource.com/download/149629/",
-                    ],
-                ),
-        ]
-

lokrez/export.py

@@ -9,179 +9,6 @@ import urllib
 import jinja2
 
 # =============================================================================
-def generate_outfile(
-        templatesdir,
-        templatename,
-        context,
-        outfilename,
-        log = None,
-        cachedir = None,
-        options = {},
-        ):
-
-    # Template rendering
-    # -------------------------------------------------------------------------
-    log.info("Generating SVG using '{}' template".format(templatename))
-    log.debug("Context : {}".format(context))
-    log.debug("Options : {}".format(options))
-
-    log.debug(
-            "Initializing jinja2 with template dir '{}'" \
-                    .format(templatesdir)
-                    )
-    jj2_env = jinja2.Environment(
-            loader = jinja2.FileSystemLoader(
-                str(templatesdir),
-                )
-            )
-
-    try:
-        jj2_tpl = jj2_env.get_template(
-                # Jinja specific path format
-                "{}/template.svg.j2".format(templatename),
-                )
-    except Exception as e:
-        log.error("Could not find template '{}'".format(templatename))
-        log.debug(e, exc_info=1)
-        return None
-
-    # To SVG
-    # -------------------------------------------------------------------------
-    if outfilename.suffix == ".svg":
-
-        if options.get("svg_embed_png", False):
-            log.debug("embedding png images")
-
-            with open(outfilename, "w") as out:
-                for line in jj2_tpl.render(context).splitlines():
-                    l = line.strip()
-
-                    if (     l.startswith("xlink:href=\"file://")
-                         and l.endswith(".png\"") ):
-                        l = html.parser.unescape(l)
-                        image_url = urllib.parse.urlparse(
-                                "=".join( l.split("=")[1:] )[1:-1],
-                                )
-                        log.debug("embedding image '{}'".format(image_url.path))
-                        with open(image_url.path, "rb") as image:
-                            line = "xlink:href=\"data:image/png;base64,{d}\"" \
-                                    .format(
-                                            d = base64 \
-                                                    .b64encode(image.read()) \
-                                                    .decode("ascii"),
-                                                    )
-
-                    out.write(line)
-                    out.write("\n")
-
-        else:
-            jj2_tpl.stream(context).dump( str(outfilename) )
-
-        return outfilename
-
-    # To PNG with inkscape
-    # -------------------------------------------------------------------------
-    if outfilename.suffix == ".png":
-
-        cachedir.mkdir(parents=True, exist_ok=True)
-
-        tmpsvg = tempfile.NamedTemporaryFile(
-                suffix=".svg",
-                mode = "w",
-                delete = False,
-                dir = str(cachedir),
-                )
-        tmpsvg.close()
-        try:
-            log.info(
-                    "Exporting to {} using inkscape" \
-                            .format(outfilename.suffix),
-                            )
-            import subprocess
-
-            jj2_tpl.stream(context).dump( tmpsvg.name )
-
-            inkscape_process = subprocess.Popen(
-                    [
-                        "inkscape",
-                        tmpsvg.name,
-                        "--export-filename",
-                        str(outfilename),
-                        ],
-                    stdout = subprocess.PIPE,
-                    stderr = subprocess.STDOUT,
-                    universal_newlines = True,
-                    )
-
-            for line_out in iter(inkscape_process.stdout.readline, ""):
-                log.debug(line_out)
-
-            inkscape_process.stdout.close()
-
-            rv = inkscape_process.wait()
-
-            if rv != 0:
-                raise Exception(
-                        "Bad inkscape return code '{}'" \
-                                .format(inkscape_process.returncode)
-                                )
-
-
-            return outfilename
-
-        except Exception as e:
-            log.warning("Failed to export with inkscape")
-            log.debug(e, exc_info=True)
-
-        finally:
-            os.unlink(tmpsvg.name)
-
-    # To png, pdf or ps with cairosvg
-    # -------------------------------------------------------------------------
-    if outfilename.suffix in [ ".png", ".pdf", ".ps" ]:
-
-        log.info("Exporting to {} using cairosvg".format(outfilename.suffix))
-
-        try:
-            import cairosvg
-        except ImportError as e:
-            log.error(
-                    "Failed to export to '{}' with cairosvg" \
-                            .format(
-                                outfilename,
-                                )
-                            )
-            log.debug(e)
-
-        else:
-            svg_str = jj2_tpl.render(context)
-
-            if outfilename.suffix == ".png":
-                conversion_fun = cairosvg.svg2png
-            elif outfilename.suffix == ".pdf":
-                conversion_fun = cairosvg.svg2pdf
-            elif outfilename.suffix == ".ps":
-                conversion_fun = cairosvg.svg2ps
-
-            conversion_fun(
-                bytestring = svg_str,
-                write_to = str(outfilename),
-                )
-
-            return outfilename
-
-    # To unsupported format
-    # -------------------------------------------------------------------------
-    log.error(
-            "Can't export to '{}' : unsupported format '{}'" \
-                    .format(
-                        outfilename,
-                        outfilename.suffix,
-                        )
-                    )
-    return None
-
-# =============================================================================
 def generate_pic(
         templatesdir,
         templatename,

lokrez/games/__init__.py

@@ -0,0 +1,39 @@
+# =============================================================================
+# -----------------------------------------------------------------------------
+class Character:
+    """Infos needed about a Smash character"""
+    def __init__(
+            self,
+            name,
+            codenames,
+            smashggid = None,
+            res_urls = {},
+            ):
+        self.res_urls = res_urls
+        self.smashggid = smashggid
+        self.name = name
+        self.codenames = codenames
+
+    def __str__(self):
+        return self.name
+
+# -----------------------------------------------------------------------------
+class Game:
+    def __init__(
+            self,
+            name,
+            fullname,
+            aliases,
+            smashggid = None,
+            ):
+
+        self.name = name
+        self.fullname = fullname
+        self.aliases = aliases
+        self.smashggid = smashggid
+
+    def list_names(self):
+        return [self.name] + [self.fullname] + self.aliases
+    
+    def __str__(self):
+        return self.name

lokrez/games/melee.py

@@ -0,0 +1,277 @@
+from . import Character,Game
+
+# -----------------------------------------------------------------------------
+GAME = Game(
+        name = "melee",
+        fullname = "Super Smash Brothers Melee",
+        aliases = [
+            "ssbm",
+            "Super Smash Bros. Melee",
+            ],
+        smashggid = 1,
+        )
+        
+# -----------------------------------------------------------------------------
+EVERYONE = [
+        Character(
+            smashggid = 1,
+            name = "bowser",
+            codenames = [ "bowser", ],
+            res_urls = {
+                "smashlyon": [
+                        "https://resources.smashlyon.com/melee/bowser.zip",
+                        ],
+                },
+            ),
+        Character(
+            smashggid = 2,
+            name = "captain falcon",
+            codenames = [ "captain", ],
+            res_urls = {
+                "smashlyon": [
+                        "https://resources.smashlyon.com/melee/captain.zip",
+                        ]
+                },
+            ),
+        Character(
+                smashggid = 3,
+                name = "donkey kong",
+                codenames = [ "donkey", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/donkey.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 4,
+                name = "dr mario",
+                codenames = [ "dr", "doc", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/dr.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 5,
+                name = "falco",
+                codenames = [ "falco", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/falco.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 6,
+                name = "fox",
+                codenames = [ "fox", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/fox.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 7,
+                name = "ganondorf",
+                codenames = [ "ganondorf", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/ganondorf.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 8,
+                name = "ice climbers",
+                codenames = [ "ice", "iceclimber", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/ice.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 9,
+                name = "jigglypuff",
+                codenames = [ "jigglypuff", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/jigglypuff.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 10,
+                name = "kirby",
+                codenames = [ "kirby", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/kirby.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 11,
+                name = "link",
+                codenames = [ "link", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/link.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 12,
+                name = "luigi",
+                codenames = [ "luigi", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/luigi.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 13,
+                name = "mario",
+                codenames = [ "mario", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/mario.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 14,
+                name = "marth",
+                codenames = [ "marth", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/marth.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 15,
+                name = "mewtwo",
+                codenames = [ "mewtwo", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/mewtwo.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 16,
+                name = "mr game and watch",
+                codenames = [ "game", "mrgameandwatch", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/game.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 17,
+                name = "ness",
+                codenames = [ "ness", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/ness.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 18,
+                name = "peach",
+                codenames = [ "peach", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/peach.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 19,
+                name = "pichu",
+                codenames = [ "pichu", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/pichu.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 20,
+                name = "pikachu",
+                codenames = [ "pikachu", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/pikachu.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 21,
+                name = "roy",
+                codenames = [ "roy", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/roy.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 22,
+                name = "samus",
+                codenames = [ "samus", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/samus.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 23,
+                name = "sheik",
+                codenames = [ "sheik", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/sheik.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 24,
+                name = "yoshi",
+                codenames = [ "yoshi", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/yoshi.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 25,
+                name = "young link",
+                codenames = [ "young", "yink",  ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/young.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 26,
+                name = "zelda",
+                codenames = [ "zelda", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/melee/zelda.zip",
+                        ],
+                    },
+                ),
+        ]
+

lokrez/games/pplus.py

@@ -0,0 +1,479 @@
+from . import Character,Game
+
+# -----------------------------------------------------------------------------
+GAME = Game(
+        name = "pplus",
+        fullname = "Project +",
+        aliases = [
+            "projectplus",
+            "p+",
+            "project plus",
+            "Project+",
+            ],
+        smashggid = 33602,
+        )
+        
+# -----------------------------------------------------------------------------
+EVERYONE = [
+        Character(
+            smashggid = 1586,
+            name = "bowser",
+            codenames = [ "Bowser", ],
+            res_urls = {
+                "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Bowser.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                },
+            ),
+        Character(
+            smashggid = 1610,
+            name = "captain falcon",
+            codenames = [ "CF", ],
+            res_urls = {
+                "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Captain Falcon.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ]
+                },
+            ),
+        Character(
+                smashggid = 1608,
+                name = "charizard",
+                codenames = [ "charizard", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Charizard.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1589,
+                name = "diddy kong",
+                codenames = [ "Diddy", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Diddy Kong.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1588,
+                name = "donkey kong",
+                codenames = [ "DK", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Donkey Kong.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1601,
+                name = "falco",
+                codenames = [ "falco", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Falco.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1600,
+                name = "fox",
+                codenames = [ "fox", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Fox.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1593,
+                name = "Ganondorf",
+                codenames = [ "ganon", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Ganondorf.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1613,
+                name = "ice climbers",
+                codenames = [ "IC", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Ice Climbers.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1616,
+                name = "ike",
+                codenames = [ "Ike", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Ike.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1607,
+                name = "ivysaur",
+                codenames = [ "Ivysaur", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Ivysaur.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1604,
+                name = "jigglypuff",
+                codenames = [ "jigglypuff", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Jigglypuff.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1599,
+                name = "king dedede",
+                codenames = [ "DeDeDe", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/DeDeDe.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1597,
+                name = "kirby",
+                codenames = [ "Kirby", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Kirby.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1590,
+                name = "link",
+                codenames = [ "link", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Link.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1609,
+                name = "lucario",
+                codenames = [ "Lucario", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Lucario.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1612,
+                name = "lucas",
+                codenames = [ "lucas", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Lucas.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1584,
+                name = "luigi",
+                codenames = [ "luigi", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Luigi.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1583,
+                name = "mario",
+                codenames = [ "Mario", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Mario.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1614,
+                name = "marth",
+                codenames = [ "Marth", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Marth.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1598,
+                name = "meta knight",
+                codenames = [ "metaknight", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Metaknight.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1605,
+                name = "mewtwo",
+                codenames = [ "mewtwo", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Mewtwo.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1611,
+                name = "ness",
+                codenames = [ "ness", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Ness.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1620,
+                name = "olimar",
+                codenames = [ "Olimar", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Olimar.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1585,
+                name = "peach",
+                codenames = [ "Peach", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Peach.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1603,
+                name = "pikachu",
+                codenames = [ "Pikachu", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Pikachu.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1618,
+                name = "pit",
+                codenames = [ "pit", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Pit.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1621,
+                name = "rob",
+                codenames = [ "Rob", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Rob.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1615,
+                name = "roy",
+                codenames = [ "Roy", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Roy.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1595,
+                name = "samus",
+                codenames = [ "samus", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Samus.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1592,
+                name = "sheik",
+                codenames = [ "sheik", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Sheik.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1622,
+                name = "snake",
+                codenames = [ "Snake", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Snake.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1623,
+                name = "sonic",
+                codenames = [ "Sonic", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Sonic.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1606,
+                name = "squirtle",
+                codenames = [ "squirtle", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Squirtle.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1594,
+                name = "toon link",
+                codenames = [ "Toon Link", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Toon Link.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1619,
+                name = "wario",
+                codenames = [ "Wario", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Wario.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1601602,
+                name = "wolf",
+                codenames = [ "Wolf", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Wolf.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1587,
+                name = "yoshi",
+                codenames = [ "Yoshi", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Yoshi.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1591,
+                name = "zelda",
+                codenames = [ "Zelda", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Zelda.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1596,
+                name = "zero suit samus",
+                codenames = [ "zss", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Zero Suit Samus.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1617,
+                name = "mr game and watch",
+                codenames = [ "Gw", ],
+                res_urls = {
+                    "smashlyon": [
+                        "https://resources.smashlyon.com/pplus/Mr Game & Watch.zip",
+                        "https://resources.smashlyon.com/pplus/Stocks icons.zip",
+                        ],
+                    },
+                ),
+        Character(
+                smashggid = 1627,
+                name = "knuckles",
+                codenames = [ "knuckles", ],
+                res_urls = {
+                    "smashlyon": [
+                        ],
+                    },
+                ),
+        ]
+

lokrez/queries/getCharsByTournamentIdAndEntrantIds.gql

@@ -5,10 +5,11 @@ query getCharsByTournamentIdAndEntrantIds($tournamentId:ID, $entrantIds:[ID])
         events
         {
             name
+            slug
             numEntrants
             sets
             (
-                perPage:100
+                perPage:50
                 page:1
                 filters:
                 {

lokrez/queries/getTournamentTopById.gql

@@ -14,6 +14,7 @@ query getTournamentTopBySlug($id:ID,$top:Int)
         events
         {
             name
+            slug
             numEntrants
             videogame
             {

lokrez/queries/getTournamentTopBySlug.gql

@@ -14,6 +14,7 @@ query getTournamentTopBySlug($slug:String,$top:Int)
         events
         {
             name
+            slug
             numEntrants
             videogame
             {

lokrez/resources.py

@@ -1,12 +1,12 @@
 import io
+import os
 import pathlib
 import sys
+import urllib
 import zipfile
 
 import requests
 
-from .characters_ssbu import EVERYONE
-
 # -----------------------------------------------------------------------------
 def download_file(url, with_progressbar = True, proxy = None):
 
@@ -45,86 +45,160 @@ def download_file(url, with_progressbar = True, proxy = None):
     return f
 
 # -----------------------------------------------------------------------------
-def download_res_ssbu(dstdir, proxy = None, log=None):
-    """Downloads SSBU resources from spriters and rename them according to
-    lokrez expectations"""
+def download_res(
+        dstdir,
+        game = None,
+        source = None,
+        store_raw = False,
+        proxy = None,
+        log = None,
+        ):
+    """TODO: Docstring for download_res_pplus.
+    :returns: TODO
+
+    """
+    if not game:
+        return
+
+    # Select default source if needed
+    if not source: