From 3a699365c832fdee2ffe7672f4bca9fae86d5781 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 3 Apr 2022 10:45:55 +0000 Subject: [PATCH] Restyled by isort --- server/app/api/folder.py | 6 ++---- server/app/api/track.py | 3 +-- server/app/functions.py | 24 ++++++++++-------------- server/app/lib/albumslib.py | 6 +++--- server/app/lib/trackslib.py | 6 +++--- server/app/prep.py | 1 + 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/server/app/api/folder.py b/server/app/api/folder.py index 1989665d..c7fa20ed 100644 --- a/server/app/api/folder.py +++ b/server/app/api/folder.py @@ -2,14 +2,12 @@ Contains all the folder routes. """ -from app import helpers import datetime import os -from flask import Blueprint, request -from app import api -from app import settings +from app import api, helpers, settings from app.lib import folderslib +from flask import Blueprint, request folder_bp = Blueprint("folder", __name__, url_prefix="/") diff --git a/server/app/api/track.py b/server/app/api/track.py index 2830d86c..8abd2a18 100644 --- a/server/app/api/track.py +++ b/server/app/api/track.py @@ -2,10 +2,9 @@ Contains all the track routes. """ +from app import api, instances from flask import Blueprint, send_file -from app import instances, api - track_bp = Blueprint("track", __name__, url_prefix="/") diff --git a/server/app/functions.py b/server/app/functions.py index dbeb07dd..b76e4f7f 100644 --- a/server/app/functions.py +++ b/server/app/functions.py @@ -2,29 +2,25 @@ This module contains functions for the server """ -import time -import os -from io import BytesIO -import random import datetime -from typing import List -import mutagen +import os +import random +import time import urllib +from io import BytesIO +from typing import List +import mutagen import requests -from mutagen.flac import MutagenError +from app import api, helpers, instances, models, settings +from app.lib import albumslib, folderslib, playlistlib, watchdoge +from mutagen.flac import FLAC, MutagenError from mutagen.id3 import ID3 -from mutagen.flac import FLAC -from progress.bar import Bar from PIL import Image +from progress.bar import Bar # from pprint import pprint -from app import helpers -from app import instances -from app import settings, models -from app import api -from app.lib import watchdoge, folderslib, playlistlib, albumslib @helpers.background diff --git a/server/app/lib/albumslib.py b/server/app/lib/albumslib.py index c6a712d1..78751d15 100644 --- a/server/app/lib/albumslib.py +++ b/server/app/lib/albumslib.py @@ -2,12 +2,12 @@ This library contains all the functions related to albums. """ -from pprint import pprint import urllib +from pprint import pprint from typing import List -from app import models, functions + +from app import api, functions, models from app.lib import trackslib -from app import api def create_everything() -> List[models.Track]: diff --git a/server/app/lib/trackslib.py b/server/app/lib/trackslib.py index c5e423b4..69afabea 100644 --- a/server/app/lib/trackslib.py +++ b/server/app/lib/trackslib.py @@ -4,10 +4,10 @@ This library contains all the functions related to tracks. import os from typing import List -from app import models, instances -from app.lib import albumslib + +from app import api, instances, models from app.helpers import remove_duplicates -from app import api +from app.lib import albumslib from progress.bar import Bar diff --git a/server/app/prep.py b/server/app/prep.py index 170015d0..f4159b7f 100644 --- a/server/app/prep.py +++ b/server/app/prep.py @@ -4,6 +4,7 @@ Contains the functions to prepare the server for use. import os + from app import settings