From ea6e11745c674c65074e0b3ace88041b9d503f53 Mon Sep 17 00:00:00 2001 From: Fomys Date: Sat, 2 Mar 2019 14:46:48 +0100 Subject: [PATCH] PEP8 --- modules/fractale.py | 211 +++++++++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 92 deletions(-) diff --git a/modules/fractale.py b/modules/fractale.py index 87bd5d9..63db3c0 100644 --- a/modules/fractale.py +++ b/modules/fractale.py @@ -1,35 +1,49 @@ -#dummy module -import asyncio -import fractale.source.main -import random +# dummy module import discord -import os -from PIL import Image -from concurrent.futures import ThreadPoolExecutor + + class MainClass(): def __init__(self, client, modules, owners, prefix): self.client = client self.modules = modules self.owners = owners self.prefix = prefix - self.events=['on_message'] #events list - self.command="%sfractale"%self.prefix #command prefix (can be empty to catch every single messages) + self.events = ['on_message'] # events list + self.command = "%sfractale" % self.prefix # command prefix (can be empty to catch every single messages) - self.name="Fractale" - self.description="Module de génération de fractales" - self.interactive=True - self.color=0x78ffc3 - self.fractals={ - "von_koch_curve_flake":{"Type":"Figures", "Max":((5000,5000), 5000, 10), "Min":((0,0),0,1), "Default":"(2500 2500) 2000 5 #ffffff 1", "Indication":"(départ) (arrivée) longueur iterations color bg stroke", "ParseData":"pfixi"}, - "von_koch_curve":{"Type":"Figures", "Max":((5000,5000),(5000,5000),10), "Min":((0,0),(0,0),1), "Default":"(0 2500) (5000 2500) 5 #ffffff 1", "Indication":"(départ) (arrivée) iterations color bg stroke", "ParseData":"ppixi"}, - "blanc_manger":{"Type":"Figures", "Max":((5000,5000),(5000,5000),10), "Min":((0,0),(0,0),1), "Default":"(1000 1000) (4000 4000) 7 #ffffff 1", "Indication":"(départ) (arrivée) iterations color bg stroke", "ParseData":"ppixi"}, - "dragon":{"Type":"Lsystem", "Max":((5000,5000), 2500,19), "Min":((0,0),1,1), "Default":"(2500 2500)", "Indication":"(origine) longueur iterations color bg stroke", "ParseData":"pfixi"}, - "sierpinski_triangle":{"Type":"Lsystem", "Max":((5000,5000),2500,11), "Min":((0,0),0,1), "Default":"(0 0)", "Indication":"(origine) longueur iterations color bg stroke", "ParseData":"pfixi"}, - "fractal_plant":{"Type":"Lsystem", "Max":((5000,5000),2500,8), "Min":((0,0),0,1), "Default":"(0 2500)", "Indication":"(origine) longueur iterations color bg stroke", "ParseData":"pfixi"}, - "koch_curve_right_angle":{"Type":"Lsystem", "Max":((5000,5000),2500,9), "Min":((0,0),0,1), "Default":"(0 5000)", "Indication":"(origine) longueur iterations color bg stroke", "ParseData":"pfixi"}, - "fractal_binary_tree":{"Type":"Lsystem", "Max":((5000,5000),2500,15), "Min":((0,0),0,1), "Default":"(0 0)", "Indication":"(origine) longueur iterations color bg stroke", "ParseData":"pfixi"} - } - self.help="""\ + self.name = "Fractale" + self.description = "Module de génération de fractales" + self.interactive = True + self.color = 0x78ffc3 + self.fractals = { + "von_koch_curve_flake": {"Type": "Figures", "Max": ((5000, 5000), 5000, 10), "Min": ((0, 0), 0, 1), + "Default": "(2500 2500) 2000 5 #ffffff 1", + "Indication": "(départ) (arrivée) longueur iterations color bg stroke", + "ParseData": "pfixi"}, + "von_koch_curve": {"Type": "Figures", "Max": ((5000, 5000), (5000, 5000), 10), "Min": ((0, 0), (0, 0), 1), + "Default": "(0 2500) (5000 2500) 5 #ffffff 1", + "Indication": "(départ) (arrivée) iterations color bg stroke", "ParseData": "ppixi"}, + "blanc_manger": {"Type": "Figures", "Max": ((5000, 5000), (5000, 5000), 10), "Min": ((0, 0), (0, 0), 1), + "Default": "(1000 1000) (4000 4000) 7 #ffffff 1", + "Indication": "(départ) (arrivée) iterations color bg stroke", "ParseData": "ppixi"}, + "dragon": {"Type": "Lsystem", "Max": ((5000, 5000), 2500, 19), "Min": ((0, 0), 1, 1), + "Default": "(2500 2500)", "Indication": "(origine) longueur iterations color bg stroke", + "ParseData": "pfixi"}, + "sierpinski_triangle": {"Type": "Lsystem", "Max": ((5000, 5000), 2500, 11), "Min": ((0, 0), 0, 1), + "Default": "(0 0)", "Indication": "(origine) longueur iterations color bg stroke", + "ParseData": "pfixi"}, + "fractal_plant": {"Type": "Lsystem", "Max": ((5000, 5000), 2500, 8), "Min": ((0, 0), 0, 1), + "Default": "(0 2500)", "Indication": "(origine) longueur iterations color bg stroke", + "ParseData": "pfixi"}, + "koch_curve_right_angle": {"Type": "Lsystem", "Max": ((5000, 5000), 2500, 9), "Min": ((0, 0), 0, 1), + "Default": "(0 5000)", + "Indication": "(origine) longueur iterations color bg stroke", + "ParseData": "pfixi"}, + "fractal_binary_tree": {"Type": "Lsystem", "Max": ((5000, 5000), 2500, 15), "Min": ((0, 0), 0, 1), + "Default": "(0 0)", "Indication": "(origine) longueur iterations color bg stroke", + "ParseData": "pfixi"} + } + self.help = """\ fractale info => Affiche les informations relatives à la fractale spécifiée. (paramètres attendus, paramètres par défaut, type des arguments) @@ -41,17 +55,17 @@ class MainClass(): -> Valeurs possible pour ```..: Toutes les fractales: -%s```"""%'\n'.join(['......: %s'%t for t in self.fractals.keys()]) +%s```""" % '\n'.join(['......: %s' % t for t in self.fractals.keys()]) async def on_message(self, message): - args=message.content.split(" ") - if len(args)==1: + args = message.content.split(" ") + if len(args) == 1: await self.modules['help'][1].send_help(message.channel, self) - elif len(args)==2: + elif len(args) == 2: pass - elif len(args)==3: - if args[1]=="" and args[2] in self.fractals.keys(): - description="""\ + elif len(args) == 3: + if args[1] == "" and args[2] in self.fractals.keys(): + description = """\ La fractale {nom} attend les arguments suivant : `{arguments}` avec le type suivant: @@ -61,98 +75,111 @@ Attention, les coordonnées des points doivent être entre parentheses et son co Les arguments valent par défaut : `{defaut}`""".format(nom=args[2]) - await message.channel.send(embed=discord.Embed(title="[%s] - Infos : *%s*"%(self.name,args[2]), description="")) + await message.channel.send( + embed=discord.Embed(title="[%s] - Infos : *%s*" % (self.name, args[2]), description="")) else: await self.modules['help'][1].send_help(message.channel, self) - #parsed_data=self.parse(message.content[len("%sfractale "%self.prefix):]))) + # parsed_data=self.parse(message.content[len("%sfractale "%self.prefix):]))) + async def send_fractal(self, message, command): - return #TODO Coder la fonction + return # TODO Coder la fonction + def parse(self, inp): - retDic={"Success":False, "Message":"", "Result":()} - #Parsing the fractal name and storing the corresponding dic into a variable + retDic = {"Success": False, "Message": "", "Result": ()} + # Parsing the fractal name and storing the corresponding dic into a variable try: - fractal=self.fractals[inp.split(' ')[0]] + fractal = self.fractals[inp.split(' ')[0]] except KeyError: - retDic.update({"Success":False, "Message":"La fractale %s n'existe pas."%inp.split(' ')[0]}) - return(retDic) - arg=' '.join(inp.split(' ')[1:]) #Stuff after the fractal name - #checking for incoherent parentheses usage - parentheses_count=0 - for i,char in enumerate(arg): - if char=='(': - parentheses_count+=1 - elif char==')': - parentheses_count-=1 - if not(-1