diff --git a/pikaraoke/app.py b/pikaraoke/app.py index 33b39c10..17f06672 100644 --- a/pikaraoke/app.py +++ b/pikaraoke/app.py @@ -12,7 +12,9 @@ import cherrypy import flask_babel +import karaoke import psutil +from constants import LANGUAGES, VERSION from flask import ( Flask, flash, @@ -25,6 +27,7 @@ ) from flask_babel import Babel from flask_paginate import Pagination, get_page_parameter +from lib.get_platform import get_platform, is_raspberry_pi from selenium import webdriver from selenium.webdriver.chrome.options import Options from selenium.webdriver.chrome.service import Service @@ -33,10 +36,6 @@ from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.support.ui import WebDriverWait -import karaoke -from constants import LANGUAGES, VERSION -from lib.get_platform import get_platform, is_raspberry_pi - try: from urllib.parse import quote, unquote except ImportError: diff --git a/pikaraoke/karaoke.py b/pikaraoke/karaoke.py index c2da65cc..b7253869 100644 --- a/pikaraoke/karaoke.py +++ b/pikaraoke/karaoke.py @@ -14,8 +14,6 @@ import ffmpeg import qrcode -from unidecode import unidecode - from lib.file_resolver import FileResolver from lib.get_platform import ( get_ffmpeg_version, @@ -24,6 +22,7 @@ is_raspberry_pi, supports_hardware_h264_encoding, ) +from unidecode import unidecode # Support function for reading lines from ffmpeg stderr without blocking diff --git a/pikaraoke/lib/vlcclient.py b/pikaraoke/lib/vlcclient.py index 21ffe62f..da074b71 100644 --- a/pikaraoke/lib/vlcclient.py +++ b/pikaraoke/lib/vlcclient.py @@ -12,7 +12,6 @@ from threading import Timer import requests - from lib.get_platform import get_platform, is_raspberry_pi