From 77b63bbfb189b5296dfa1118aea397f7c853f5c6 Mon Sep 17 00:00:00 2001 From: thatdonfc Date: Fri, 18 Dec 2020 14:39:19 -0800 Subject: [PATCH] isort, flake8, black --- .git-blame-ignore-revs | 5 ++++- ledfx/__main__.py | 10 +++++----- ledfx/api/__init__.py | 6 ++++-- ledfx/api/audio_devices.py | 8 +++++--- ledfx/api/config.py | 6 ++++-- ledfx/api/device.py | 8 +++++--- ledfx/api/device_effects.py | 12 +++++++----- ledfx/api/device_presets.py | 10 ++++++---- ledfx/api/devices.py | 10 ++++++---- ledfx/api/effect.py | 6 ++++-- ledfx/api/effects.py | 6 ++++-- ledfx/api/find_devices.py | 6 ++++-- ledfx/api/graphics_quality.py | 6 ++++-- ledfx/api/info.py | 6 ++++-- ledfx/api/presets.py | 8 +++++--- ledfx/api/scenes.py | 10 ++++++---- ledfx/api/schema.py | 8 +++++--- ledfx/api/schema_types.py | 8 +++++--- ledfx/api/utils.py | 2 ++ ledfx/api/virtuals.py | 12 +++++------- ledfx/api/websocket.py | 8 +++++--- ledfx/config.py | 9 +++++---- ledfx/core.py | 11 ++++------- ledfx/devices/FXMatrix.py | 8 +++++--- ledfx/devices/__init__.py | 16 +++++++++------- ledfx/devices/e131.py | 8 +++++--- ledfx/devices/udp.py | 8 +++++--- ledfx/effects/__init__.py | 11 +++++------ ledfx/effects/audio.py | 22 +++++++++++----------- ledfx/effects/bands(Reactive).py | 7 ++++--- ledfx/effects/bar(Reactive).py | 7 ++++--- ledfx/effects/blocks(Reactive).py | 5 +++-- ledfx/effects/effectlets/__init__.py | 2 +- ledfx/effects/energy(Reactive).py | 7 ++++--- ledfx/effects/equalizer(reactive).py | 7 ++++--- ledfx/effects/fade.py | 7 ++++--- ledfx/effects/gradient.py | 12 +++++++----- ledfx/effects/magnitude(Reactive).py | 7 ++++--- ledfx/effects/math.py | 3 ++- ledfx/effects/mel.py | 3 ++- ledfx/effects/modulate.py | 6 ++++-- ledfx/effects/multiBar(Reactive).py | 7 ++++--- ledfx/effects/pitchSpectrum(Reactive).py | 13 +++++-------- ledfx/effects/power(Reactive).py | 7 ++++--- ledfx/effects/rain(Reactive).py | 12 +++++++----- ledfx/effects/rainbow.py | 5 +++-- ledfx/effects/real_strobe(Reactive).py | 13 +++++++------ ledfx/effects/scroll(Reactive).py | 7 ++++--- ledfx/effects/singleColor.py | 5 +++-- ledfx/effects/spectrum(Reactive).py | 5 +++-- ledfx/effects/strobe(Reactive).py | 7 ++++--- ledfx/effects/temporal.py | 6 ++++-- ledfx/effects/wavelength(Reactive).py | 3 ++- ledfx/events.py | 3 ++- ledfx/http_manager.py | 12 +++++++----- ledfx/utils.py | 15 ++++++++------- release.py | 2 +- 57 files changed, 259 insertions(+), 190 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 293653af..545e4c38 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -11,4 +11,7 @@ b55fa2f9d507c52c5afc2b5260b38c800b6b8ed4 79f6416b605b4aa40abf1dad9f2e6e217a5c4242 # Black Formatting cd60a2b Dec 6 2020 -cd60a2b3f67bc7c4adfe630b80e95600380167db \ No newline at end of file +cd60a2b3f67bc7c4adfe630b80e95600380167db + +# Add pre-commit-config, isort, flake8, black 52ac9fb Dec 11 2020 +52ac9fb45dd0f68475e7d46711391c9d0a23517d diff --git a/ledfx/__main__.py b/ledfx/__main__.py index b0c2e9f4..9271440b 100644 --- a/ledfx/__main__.py +++ b/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) diff --git a/ledfx/api/__init__.py b/ledfx/api/__init__.py index 309ad30f..323f34f5 100644 --- a/ledfx/api/__init__.py +++ b/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): diff --git a/ledfx/api/audio_devices.py b/ledfx/api/audio_devices.py index 9f19dc79..33635e95 100644 --- a/ledfx/api/audio_devices.py +++ b/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__) diff --git a/ledfx/api/config.py b/ledfx/api/config.py index e133c631..27f3c94b 100644 --- a/ledfx/api/config.py +++ b/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__) diff --git a/ledfx/api/device.py b/ledfx/api/device.py index 739a2338..de22a7fe 100644 --- a/ledfx/api/device.py +++ b/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__) diff --git a/ledfx/api/device_effects.py b/ledfx/api/device_effects.py index 51ccbdd0..49b39357 100644 --- a/ledfx/api/device_effects.py +++ b/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__) diff --git a/ledfx/api/device_presets.py b/ledfx/api/device_presets.py index b2734c29..b3ac8c9b 100644 --- a/ledfx/api/device_presets.py +++ b/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__) diff --git a/ledfx/api/devices.py b/ledfx/api/devices.py index b1287094..07154e31 100644 --- a/ledfx/api/devices.py +++ b/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__) diff --git a/ledfx/api/effect.py b/ledfx/api/effect.py index c8aa4fd5..c8c1d43d 100644 --- a/ledfx/api/effect.py +++ b/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__) diff --git a/ledfx/api/effects.py b/ledfx/api/effects.py index 073b880a..986dcb32 100644 --- a/ledfx/api/effects.py +++ b/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__) diff --git a/ledfx/api/find_devices.py b/ledfx/api/find_devices.py index a0f838f9..fb332578 100644 --- a/ledfx/api/find_devices.py +++ b/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__) diff --git a/ledfx/api/graphics_quality.py b/ledfx/api/graphics_quality.py index be3a8a41..948612ae 100644 --- a/ledfx/api/graphics_quality.py +++ b/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__) diff --git a/ledfx/api/info.py b/ledfx/api/info.py index 84a5037c..28460936 100644 --- a/ledfx/api/info.py +++ b/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__) diff --git a/ledfx/api/presets.py b/ledfx/api/presets.py index 61b2bd1b..48773c70 100644 --- a/ledfx/api/presets.py +++ b/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__) diff --git a/ledfx/api/scenes.py b/ledfx/api/scenes.py index d1799a34..91afbd4d 100644 --- a/ledfx/api/scenes.py +++ b/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__) diff --git a/ledfx/api/schema.py b/ledfx/api/schema.py index e0cec344..5052529b 100644 --- a/ledfx/api/schema.py +++ b/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__) diff --git a/ledfx/api/schema_types.py b/ledfx/api/schema_types.py index ce0924c0..9427a558 100644 --- a/ledfx/api/schema_types.py +++ b/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__) diff --git a/ledfx/api/utils.py b/ledfx/api/utils.py index 744d5c5a..77372a72 100644 --- a/ledfx/api/utils.py +++ b/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 = { diff --git a/ledfx/api/virtuals.py b/ledfx/api/virtuals.py index 7c8e8edc..8d7f73bf 100644 --- a/ledfx/api/virtuals.py +++ b/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 = { - "virtuals" : { - "list" : self._ledfx.config["virtuals"] - } - } + response = {"virtuals": {"list": self._ledfx.config["virtuals"]}} return web.json_response(data=response, status=200) diff --git a/ledfx/api/websocket.py b/ledfx/api/websocket.py index f61d7b75..02b30358 100644 --- a/ledfx/api/websocket.py +++ b/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 diff --git a/ledfx/config.py b/ledfx/config.py index dd184d43..7d552d14 100644 --- a/ledfx/config.py +++ b/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, ) diff --git a/ledfx/core.py b/ledfx/core.py index 07bf3a93..e507f12f 100644 --- a/ledfx/core.py +++ b/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__) diff --git a/ledfx/devices/FXMatrix.py b/ledfx/devices/FXMatrix.py index 3e01e4b9..c6ec7f0b 100644 --- a/ledfx/devices/FXMatrix.py +++ b/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__) diff --git a/ledfx/devices/__init__.py b/ledfx/devices/__init__.py index 283aca25..ee8fb8f1 100644 --- a/ledfx/devices/__init__.py +++ b/ledfx/devices/__init__.py @@ -1,14 +1,16 @@ -from ledfx.utils import BaseRegistry, RegistryLoader, generate_id -from ledfx.config import save_config -from ledfx.events import DeviceUpdateEvent, Event +import asyncio +import logging +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 -import socket + +from ledfx.config import save_config +from ledfx.events import DeviceUpdateEvent, Event +from ledfx.utils import BaseRegistry, RegistryLoader, generate_id _LOGGER = logging.getLogger(__name__) diff --git a/ledfx/devices/e131.py b/ledfx/devices/e131.py index f9841686..4f35e134 100644 --- a/ledfx/devices/e131.py +++ b/ledfx/devices/e131.py @@ -1,9 +1,11 @@ import logging -from ledfx.devices import Device -import voluptuous as vol +import time + import numpy as np import sacn -import time +import voluptuous as vol + +from ledfx.devices import Device _LOGGER = logging.getLogger(__name__) diff --git a/ledfx/devices/udp.py b/ledfx/devices/udp.py index f283e7f4..b2009206 100644 --- a/ledfx/devices/udp.py +++ b/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__) diff --git a/ledfx/effects/__init__.py b/ledfx/effects/__init__.py index 00843f5b..cef54409 100644 --- a/ledfx/effects/__init__.py +++ b/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 - -import logging - +from ledfx.utils import BaseRegistry, RegistryLoader _LOGGER = logging.getLogger(__name__) diff --git a/ledfx/effects/audio.py b/ledfx/effects/audio.py index b2d552b4..50397f9b 100644 --- a/ledfx/effects/audio.py +++ b/ledfx/effects/audio.py @@ -1,19 +1,19 @@ -from collections import namedtuple -import time import logging -import pyaudio -from ledfx.effects import Effect, smooth -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 +import time +from collections import namedtuple 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__) diff --git a/ledfx/effects/bands(Reactive).py b/ledfx/effects/bands(Reactive).py index 893de257..c9086ac2 100644 --- a/ledfx/effects/bands(Reactive).py +++ b/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): diff --git a/ledfx/effects/bar(Reactive).py b/ledfx/effects/bar(Reactive).py index ed7e12ab..c3455f9d 100644 --- a/ledfx/effects/bar(Reactive).py +++ b/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): diff --git a/ledfx/effects/blocks(Reactive).py b/ledfx/effects/blocks(Reactive).py index 582cb984..a0488764 100644 --- a/ledfx/effects/blocks(Reactive).py +++ b/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): diff --git a/ledfx/effects/effectlets/__init__.py b/ledfx/effects/effectlets/__init__.py index a0df775d..0aac682c 100644 --- a/ledfx/effects/effectlets/__init__.py +++ b/ledfx/effects/effectlets/__init__.py @@ -1,5 +1,5 @@ -import os import fnmatch +import os EFFECTLET_LIST = [] diff --git a/ledfx/effects/energy(Reactive).py b/ledfx/effects/energy(Reactive).py index 986a4f82..53d7f1d2 100644 --- a/ledfx/effects/energy(Reactive).py +++ b/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): diff --git a/ledfx/effects/equalizer(reactive).py b/ledfx/effects/equalizer(reactive).py index f14aec43..cc787ccb 100644 --- a/ledfx/effects/equalizer(reactive).py +++ b/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): diff --git a/ledfx/effects/fade.py b/ledfx/effects/fade.py index bc5953e2..e570f7d5 100644 --- a/ledfx/effects/fade.py +++ b/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): diff --git a/ledfx/effects/gradient.py b/ledfx/effects/gradient.py index 2ef521a9..f1e0d4a7 100644 --- a/ledfx/effects/gradient.py +++ b/ledfx/effects/gradient.py @@ -1,10 +1,12 @@ -from ledfx.effects.temporal import TemporalEffect -from ledfx.effects.modulate import ModulateEffect +import logging + +import numpy as np +import voluptuous as vol + from ledfx.color import COLORS, GRADIENTS from ledfx.effects import Effect -import voluptuous as vol -import numpy as np -import logging +from ledfx.effects.modulate import ModulateEffect +from ledfx.effects.temporal import TemporalEffect _LOGGER = logging.getLogger(__name__) diff --git a/ledfx/effects/magnitude(Reactive).py b/ledfx/effects/magnitude(Reactive).py index 8f9be743..9ad684b7 100644 --- a/ledfx/effects/magnitude(Reactive).py +++ b/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): diff --git a/ledfx/effects/math.py b/ledfx/effects/math.py index ac4f3f34..ee761d96 100644 --- a/ledfx/effects/math.py +++ b/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): diff --git a/ledfx/effects/mel.py b/ledfx/effects/mel.py index 9b8cc4e9..1cd32fa9 100644 --- a/ledfx/effects/mel.py +++ b/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. diff --git a/ledfx/effects/modulate.py b/ledfx/effects/modulate.py index d84af747..84e0e746 100644 --- a/ledfx/effects/modulate.py +++ b/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 diff --git a/ledfx/effects/multiBar(Reactive).py b/ledfx/effects/multiBar(Reactive).py index 063b93bd..489d360c 100644 --- a/ledfx/effects/multiBar(Reactive).py +++ b/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): diff --git a/ledfx/effects/pitchSpectrum(Reactive).py b/ledfx/effects/pitchSpectrum(Reactive).py index ec379bbf..56f55d73 100644 --- a/ledfx/effects/pitchSpectrum(Reactive).py +++ b/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): diff --git a/ledfx/effects/power(Reactive).py b/ledfx/effects/power(Reactive).py index 4f3df9f5..c9d3abd4 100644 --- a/ledfx/effects/power(Reactive).py +++ b/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): diff --git a/ledfx/effects/rain(Reactive).py b/ledfx/effects/rain(Reactive).py index aaf003ed..99b96577 100644 --- a/ledfx/effects/rain(Reactive).py +++ b/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): diff --git a/ledfx/effects/rainbow.py b/ledfx/effects/rainbow.py index cc9b669c..8e21e3cf 100644 --- a/ledfx/effects/rainbow.py +++ b/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): diff --git a/ledfx/effects/real_strobe(Reactive).py b/ledfx/effects/real_strobe(Reactive).py index 82df8a38..5aa49fcc 100644 --- a/ledfx/effects/real_strobe(Reactive).py +++ b/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): diff --git a/ledfx/effects/scroll(Reactive).py b/ledfx/effects/scroll(Reactive).py index c8e03fa4..3c56c51f 100644 --- a/ledfx/effects/scroll(Reactive).py +++ b/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): diff --git a/ledfx/effects/singleColor.py b/ledfx/effects/singleColor.py index a4cad183..69671585 100644 --- a/ledfx/effects/singleColor.py +++ b/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): diff --git a/ledfx/effects/spectrum(Reactive).py b/ledfx/effects/spectrum(Reactive).py index 671d7a39..e2d86307 100644 --- a/ledfx/effects/spectrum(Reactive).py +++ b/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): diff --git a/ledfx/effects/strobe(Reactive).py b/ledfx/effects/strobe(Reactive).py index 55a9f2a7..27140c89 100644 --- a/ledfx/effects/strobe(Reactive).py +++ b/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): diff --git a/ledfx/effects/temporal.py b/ledfx/effects/temporal.py index 52a86a9b..0d0842c6 100644 --- a/ledfx/effects/temporal.py +++ b/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 diff --git a/ledfx/effects/wavelength(Reactive).py b/ledfx/effects/wavelength(Reactive).py index 34119539..7dc0641e 100644 --- a/ledfx/effects/wavelength(Reactive).py +++ b/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): diff --git a/ledfx/events.py b/ledfx/events.py index 689462d8..7943624d 100644 --- a/ledfx/events.py +++ b/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__) diff --git a/ledfx/http_manager.py b/ledfx/http_manager.py index 3f804783..25bdb603 100644 --- a/ledfx/http_manager.py +++ b/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: diff --git a/ledfx/utils.py b/ledfx/utils.py index 86f06438..df55f928 100644 --- a/ledfx/utils.py +++ b/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__) diff --git a/release.py b/release.py index 21d76d56..3f480ff2 100644 --- a/release.py +++ b/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