isort, flake8, black

.git-blame-ignore-revs

@@ -11,4 +11,7 @@ b55fa2f9d507c52c5afc2b5260b38c800b6b8ed4
 79f6416b605b4aa40abf1dad9f2e6e217a5c4242
 
 # Black Formatting cd60a2b Dec 6 2020
-cd60a2b3f67bc7c4adfe630b80e95600380167db
+cd60a2b3f67bc7c4adfe630b80e95600380167db
+
+# Add pre-commit-config, isort, flake8, black 52ac9fb Dec 11 2020
+52ac9fb45dd0f68475e7d46711391c9d0a23517d

ledfx/__main__.py

@@ -17,20 +17,20 @@ For non-development purposes run:
 """
 
 import argparse
-import sys
 import logging
+import sys
 import warnings
 
 from pyupdater.client import Client
 
+import ledfx.config as config_helpers
 from ledfx.consts import (
-    REQUIRED_PYTHON_VERSION,
-    REQUIRED_PYTHON_STRING,
-    PROJECT_VERSION,
     PROJECT_NAME,
+    PROJECT_VERSION,
+    REQUIRED_PYTHON_STRING,
+    REQUIRED_PYTHON_VERSION,
 )
 from ledfx.core import LedFxCore
-import ledfx.config as config_helpers
 
 # Logger Variables
 warnings.filterwarnings("ignore", category=DeprecationWarning)

ledfx/api/__init__.py

@@ -1,7 +1,9 @@
-from ledfx.utils import BaseRegistry, RegistryLoader
-from aiohttp import web
 import inspect
 
+from aiohttp import web
+
+from ledfx.utils import BaseRegistry, RegistryLoader
+
 
 @BaseRegistry.no_registration
 class RestEndpoint(BaseRegistry):

ledfx/api/audio_devices.py

@@ -1,8 +1,10 @@
+import logging
+
+import pyaudio
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.config import save_config
-from aiohttp import web
-import logging
-import pyaudio
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/api/config.py

@@ -1,7 +1,9 @@
-from ledfx.api import RestEndpoint
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/device.py

@@ -1,8 +1,10 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/device_effects.py

@@ -1,9 +1,11 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from aiohttp import web
-import voluptuous as vol
-import random
 import logging
+import random
+
+import voluptuous as vol
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/api/device_presets.py

@@ -1,9 +1,11 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from aiohttp import web
-from ledfx.utils import generate_id
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
+from ledfx.utils import generate_id
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/devices.py

@@ -1,9 +1,11 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from ledfx.utils import generate_id
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
+from ledfx.utils import generate_id
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/effect.py

@@ -1,7 +1,9 @@
-from ledfx.api import RestEndpoint
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/effects.py

@@ -1,7 +1,9 @@
-from ledfx.api import RestEndpoint
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/find_devices.py

@@ -1,7 +1,9 @@
+import logging
+
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.utils import async_fire_and_forget
-from aiohttp import web
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/api/graphics_quality.py

@@ -1,7 +1,9 @@
+import logging
+
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.config import save_config
-from aiohttp import web
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/api/info.py

@@ -1,7 +1,9 @@
+import logging
+
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.consts import PROJECT_VERSION
-from aiohttp import web
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/api/presets.py

@@ -1,8 +1,10 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/scenes.py

@@ -1,9 +1,11 @@
-from ledfx.config import save_config
-from ledfx.api import RestEndpoint
-from ledfx.utils import generate_id
-from aiohttp import web
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.config import save_config
+from ledfx.utils import generate_id
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/schema.py

@@ -1,8 +1,10 @@
-from ledfx.api import RestEndpoint
-from aiohttp import web
-from ledfx.api.utils import convertToJsonSchema
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.api.utils import convertToJsonSchema
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/schema_types.py

@@ -1,8 +1,10 @@
-from ledfx.api import RestEndpoint
-from aiohttp import web
-from ledfx.api.utils import convertToJsonSchema
 import logging
 
+from aiohttp import web
+
+from ledfx.api import RestEndpoint
+from ledfx.api.utils import convertToJsonSchema
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/api/utils.py

@@ -1,6 +1,8 @@
 """Module to convert voluptuous schemas to dictionaries."""
 import collections
+
 import voluptuous as vol
+
 from ledfx.utils import generate_title
 
 TYPES_MAP = {

ledfx/api/virtuals.py

@@ -1,7 +1,9 @@
+import logging
+
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.config import save_config
-from aiohttp import web
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -11,11 +13,7 @@ class VirtualsEndpoint(RestEndpoint):
     ENDPOINT_PATH = "/api/virtuals"
 
     async def get(self) -> web.Response:
-        response = {
+        response = {"virtuals": {"list": self._ledfx.config["virtuals"]}}
-            "virtuals" : {
-                "list" : self._ledfx.config["virtuals"]
-            }
-        }
 
         return web.json_response(data=response, status=200)
 

ledfx/api/websocket.py

@@ -1,9 +1,11 @@
+import asyncio
 import json
 import logging
-import asyncio
-from aiohttp import web
-import voluptuous as vol
 from concurrent import futures
+
+import voluptuous as vol
+from aiohttp import web
+
 from ledfx.api import RestEndpoint
 from ledfx.events import Event
 

ledfx/config.py

@@ -1,8 +1,9 @@
-import voluptuous as vol
 import logging
-import yaml
-import sys
 import os
+import sys
+
+import voluptuous as vol
+import yaml
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -21,7 +22,7 @@ CORE_CONFIG_SCHEMA = vol.Schema(
         vol.Optional("custom_presets", default={}): dict,
         vol.Optional("scenes", default={}): dict,
         vol.Optional("fade", default=1.0): float,
-        vol.Optional("virtuals", default=[]): list
+        vol.Optional("virtuals", default=[]): list,
     },
     extra=vol.ALLOW_EXTRA,
 )

ledfx/core.py

@@ -2,16 +2,13 @@ import asyncio
 import logging
 import sys
 from concurrent.futures import ThreadPoolExecutor
-from ledfx.utils import async_fire_and_forget
+
-from ledfx.http_manager import HttpServer
+from ledfx.config import load_config, load_default_presets, save_config
 from ledfx.devices import Devices
 from ledfx.effects import Effects
-from ledfx.config import (
-    load_config,
-    save_config,
-    load_default_presets,
-)
 from ledfx.events import Events, LedFxShutdownEvent
+from ledfx.http_manager import HttpServer
+from ledfx.utils import async_fire_and_forget
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/devices/FXMatrix.py

@@ -1,9 +1,11 @@
-from ledfx.devices import Device
 import logging
-import voluptuous as vol
-import numpy as np
 import socket
 
+import numpy as np
+import voluptuous as vol
+
+from ledfx.devices import Device
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/devices/__init__.py

@@ -1,14 +1,16 @@
-from ledfx.utils import BaseRegistry, RegistryLoader, generate_id
+import asyncio
-from ledfx.config import save_config
+import logging
-from ledfx.events import DeviceUpdateEvent, Event
+import socket
 from abc import abstractmethod
-import voluptuous as vol
+
 import numpy as np
 import requests
+import voluptuous as vol
 import zeroconf
-import logging
+
-import asyncio
+from ledfx.config import save_config
-import socket
+from ledfx.events import DeviceUpdateEvent, Event
+from ledfx.utils import BaseRegistry, RegistryLoader, generate_id
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/devices/e131.py

@@ -1,9 +1,11 @@
 import logging
-from ledfx.devices import Device
+import time
-import voluptuous as vol
+
 import numpy as np
 import sacn
-import time
+import voluptuous as vol
+
+from ledfx.devices import Device
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/devices/udp.py

@@ -1,9 +1,11 @@
-from ledfx.devices import Device
 import logging
-import voluptuous as vol
-import numpy as np
 import socket
 
+import numpy as np
+import voluptuous as vol
+
+from ledfx.devices import Device
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/effects/__init__.py

@@ -1,14 +1,13 @@
-from ledfx.utils import BaseRegistry, RegistryLoader
+import colorsys
+import logging
 
 # from ledfx.effects.audio import FREQUENCY_RANGES
 from functools import lru_cache
-import voluptuous as vol
+
 import numpy as np
+import voluptuous as vol
 
-import colorsys
+from ledfx.utils import BaseRegistry, RegistryLoader
-
-import logging
-
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/effects/audio.py

@@ -1,19 +1,19 @@
-from collections import namedtuple
-import time
 import logging
-import pyaudio
+import time
-from ledfx.effects import Effect, smooth
+from collections import namedtuple
-import voluptuous as vol
-import ledfx.effects.mel as mel
-from ledfx.effects.math import ExpFilter
-from ledfx.events import GraphUpdateEvent
-import ledfx.effects.math as math
 from functools import lru_cache
-import numpy as np
+from math import log
 
 import aubio
+import numpy as np
+import pyaudio
+import voluptuous as vol
 
-from math import log
+import ledfx.effects.math as math
+import ledfx.effects.mel as mel
+from ledfx.effects import Effect, smooth
+from ledfx.effects.math import ExpFilter
+from ledfx.events import GraphUpdateEvent
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/effects/bands(Reactive).py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS, GRADIENTS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import GRADIENTS, COLORS
-import voluptuous as vol
-import numpy as np
 
 
 class BandsAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/bar(Reactive).py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import GRADIENTS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import GRADIENTS
-import voluptuous as vol
-import numpy as np
 
 
 class BarAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/blocks(Reactive).py

@@ -1,7 +1,8 @@
+import numpy as np
+import voluptuous as vol
+
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-import voluptuous as vol
-import numpy as np
 
 
 class BlocksAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/effectlets/__init__.py

@@ -1,5 +1,5 @@
-import os
 import fnmatch
+import os
 
 EFFECTLET_LIST = []
 

ledfx/effects/energy(Reactive).py

@@ -1,7 +1,8 @@
-from ledfx.effects.audio import AudioReactiveEffect
-from ledfx.color import COLORS
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS
+from ledfx.effects.audio import AudioReactiveEffect
 
 
 class EnergyAudioEffect(AudioReactiveEffect):

ledfx/effects/equalizer(reactive).py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import GRADIENTS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import GRADIENTS
-import voluptuous as vol
-import numpy as np
 
 
 class EQAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/fade.py

@@ -1,7 +1,8 @@
-from ledfx.effects.temporal import TemporalEffect
-from ledfx.effects.gradient import GradientEffect
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.effects.gradient import GradientEffect
+from ledfx.effects.temporal import TemporalEffect
 
 
 class FadeEffect(TemporalEffect, GradientEffect):

ledfx/effects/gradient.py

@@ -1,10 +1,12 @@
-from ledfx.effects.temporal import TemporalEffect
+import logging
-from ledfx.effects.modulate import ModulateEffect
+
+import numpy as np
+import voluptuous as vol
+
 from ledfx.color import COLORS, GRADIENTS
 from ledfx.effects import Effect
-import voluptuous as vol
+from ledfx.effects.modulate import ModulateEffect
-import numpy as np
+from ledfx.effects.temporal import TemporalEffect
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 

ledfx/effects/magnitude(Reactive).py

@@ -1,7 +1,8 @@
-from ledfx.effects.audio import AudioReactiveEffect, FREQUENCY_RANGES
-from ledfx.effects.gradient import GradientEffect
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.effects.audio import FREQUENCY_RANGES, AudioReactiveEffect
+from ledfx.effects.gradient import GradientEffect
 
 
 class MagnitudeAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/math.py

@@ -1,6 +1,7 @@
-import numpy as np
 from functools import lru_cache
 
+import numpy as np
+
 
 @lru_cache(maxsize=32)
 def _normalized_linspace(size):

ledfx/effects/mel.py

@@ -30,9 +30,10 @@ Functions
 ---------
 """
 
-from numpy import abs, arange, linspace, zeros, mean
 from math import log
 
+from numpy import abs, arange, linspace, mean, zeros
+
 
 def hertz_to_mel(freq):
     """Returns mel-frequency from linear frequency input.

ledfx/effects/modulate.py

@@ -1,7 +1,9 @@
-from ledfx.effects import Effect
 import logging
-import voluptuous as vol
+
 import numpy as np
+import voluptuous as vol
+
+from ledfx.effects import Effect
 
 _LOGGER = logging.getLogger(__name__)
 _rate = 60

ledfx/effects/multiBar(Reactive).py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import GRADIENTS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import GRADIENTS
-import voluptuous as vol
-import numpy as np
 
 
 class MultiBarAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/pitchSpectrum(Reactive).py

@@ -1,13 +1,10 @@
-from ledfx.effects.audio import (
-    AudioReactiveEffect,
-    MIN_MIDI,
-    MAX_MIDI,
-)
-from ledfx.effects.gradient import GradientEffect
-from ledfx.effects import mix_colors
-from ledfx.color import COLORS
 import voluptuous as vol
 
+from ledfx.color import COLORS
+from ledfx.effects import mix_colors
+from ledfx.effects.audio import MAX_MIDI, MIN_MIDI, AudioReactiveEffect
+from ledfx.effects.gradient import GradientEffect
+
 
 class PitchSpectrumAudioEffect(AudioReactiveEffect, GradientEffect):
 

ledfx/effects/power(Reactive).py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import COLORS
-import voluptuous as vol
-import numpy as np
 
 
 class PowerAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/effects/rain(Reactive).py

@@ -1,10 +1,12 @@
+import os.path
+from random import randint
+
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.effectlets import EFFECTLET_LIST
-from ledfx.color import COLORS
-import voluptuous as vol
-import numpy as np
-from random import randint
-import os.path
 
 
 class RainAudioEffect(AudioReactiveEffect):

ledfx/effects/rainbow.py

@@ -1,7 +1,8 @@
-from ledfx.effects.temporal import TemporalEffect
-from ledfx.effects import fill_rainbow
 import voluptuous as vol
 
+from ledfx.effects import fill_rainbow
+from ledfx.effects.temporal import TemporalEffect
+
 
 class RainbowEffect(TemporalEffect):
 

ledfx/effects/real_strobe(Reactive).py

@@ -1,11 +1,12 @@
+import queue
+import time
+
+import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS, GRADIENTS
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-from ledfx.color import GRADIENTS
-from ledfx.color import COLORS
-import voluptuous as vol
-import numpy as np
-import time
-import queue
 
 
 class Strobe(AudioReactiveEffect, GradientEffect):

ledfx/effects/scroll(Reactive).py

@@ -1,7 +1,8 @@
-from ledfx.effects.audio import AudioReactiveEffect
-from ledfx.color import COLORS
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS
+from ledfx.effects.audio import AudioReactiveEffect
 
 
 class ScrollAudioEffect(AudioReactiveEffect):

ledfx/effects/singleColor.py

@@ -1,8 +1,9 @@
+import numpy as np
+import voluptuous as vol
+
 from ledfx.color import COLORS
 from ledfx.effects.modulate import ModulateEffect
 from ledfx.effects.temporal import TemporalEffect
-import voluptuous as vol
-import numpy as np
 
 
 class SingleColorEffect(TemporalEffect, ModulateEffect):

ledfx/effects/spectrum(Reactive).py

@@ -1,6 +1,7 @@
-from ledfx.effects.audio import AudioReactiveEffect
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.effects.audio import AudioReactiveEffect
 
 
 class SpectrumAudioEffect(AudioReactiveEffect):

ledfx/effects/strobe(Reactive).py

@@ -1,7 +1,8 @@
-from ledfx.effects.audio import AudioReactiveEffect
-from ledfx.color import COLORS
-import voluptuous as vol
 import numpy as np
+import voluptuous as vol
+
+from ledfx.color import COLORS
+from ledfx.effects.audio import AudioReactiveEffect
 
 
 class Strobe(AudioReactiveEffect):

ledfx/effects/temporal.py

@@ -1,11 +1,13 @@
-import time
 import logging
-from ledfx.effects import Effect
+import time
 
 # from ledfx.effects.audio import AudioReactiveEffect
 from threading import Thread
+
 import voluptuous as vol
 
+from ledfx.effects import Effect
+
 _LOGGER = logging.getLogger(__name__)
 DEFAULT_RATE = 1.0 / 300.0
 

ledfx/effects/wavelength(Reactive).py

@@ -1,6 +1,7 @@
+import voluptuous as vol
+
 from ledfx.effects.audio import AudioReactiveEffect
 from ledfx.effects.gradient import GradientEffect
-import voluptuous as vol
 
 
 class WavelengthAudioEffect(AudioReactiveEffect, GradientEffect):

ledfx/events.py

@@ -1,7 +1,8 @@
 import logging
-import numpy as np
 from typing import Callable
 
+import numpy as np
+
 _LOGGER = logging.getLogger(__name__)
 
 

ledfx/http_manager.py

@@ -1,12 +1,14 @@
 import logging
-import jinja2
-import aiohttp_jinja2
-from aiohttp import web
-from ledfx.api import RestApi
-import ledfx_frontend
 import os
 import sys
 
+import aiohttp_jinja2
+import jinja2
+from aiohttp import web
+
+import ledfx_frontend
+from ledfx.api import RestApi
+
 try:
     base_path = sys._MEIPASS
 except BaseException:

ledfx/utils.py

@@ -1,15 +1,16 @@
-from asyncio import coroutines, ensure_future
-from subprocess import PIPE, Popen
 import concurrent.futures
-import voluptuous as vol
-from abc import ABC
-import logging
-import inspect
 import importlib
+import inspect
+import logging
+import os
 import pkgutil
 import re
 import sys
-import os
+from abc import ABC
+from asyncio import coroutines, ensure_future
+from subprocess import PIPE, Popen
+
+import voluptuous as vol
 
 _LOGGER = logging.getLogger(__name__)
 

release.py

@@ -2,8 +2,8 @@
 
 import argparse
 import re
-import subprocess
 import shutil
+import subprocess
 
 from ledfx.consts import MAJOR_VERSION, MICRO_VERSION, MINOR_VERSION