From 5272a3d35680bbb9f4559ebf9583d4aa93b1c695 Mon Sep 17 00:00:00 2001 From: ChaotiCryptidz Date: Fri, 4 Feb 2022 13:35:01 +0000 Subject: [PATCH] move some files around --- main.py | 4 ++-- musicutil/{ => commands}/copy_command.py | 6 +++--- musicutil/{ => commands}/process_command.py | 8 ++++---- musicutil/{ => utils}/load_tag_information.py | 2 +- musicutil/{ => utils}/scan_for_music.py | 4 ++-- musicutil/{ => utils}/substitutions.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename musicutil/{ => commands}/copy_command.py (96%) rename musicutil/{ => commands}/process_command.py (88%) rename musicutil/{ => utils}/load_tag_information.py (93%) rename musicutil/{ => utils}/scan_for_music.py (87%) rename musicutil/{ => utils}/substitutions.py (89%) diff --git a/main.py b/main.py index e6f442a..c363a1d 100755 --- a/main.py +++ b/main.py @@ -2,8 +2,8 @@ import argparse -from musicutil.process_command import ProcessCommand -from musicutil.copy_command import CopyCommand +from musicutil.commands.process_command import ProcessCommand +from musicutil.commands.copy_command import CopyCommand parser = argparse.ArgumentParser(description='Highly Opinionated Music ') subparsers = parser.add_subparsers(dest="subparser_name") diff --git a/musicutil/copy_command.py b/musicutil/commands/copy_command.py similarity index 96% rename from musicutil/copy_command.py rename to musicutil/commands/copy_command.py index b599f3a..5d794b1 100644 --- a/musicutil/copy_command.py +++ b/musicutil/commands/copy_command.py @@ -1,6 +1,6 @@ -from .types import File -from .scan_for_music import scan_for_music -from .load_tag_information import load_tag_information +from ..types import File +from ..utils.scan_for_music import scan_for_music +from ..utils.load_tag_information import load_tag_information from os import makedirs as make_directories from os.path import exists as path_exists diff --git a/musicutil/process_command.py b/musicutil/commands/process_command.py similarity index 88% rename from musicutil/process_command.py rename to musicutil/commands/process_command.py index 2f68d87..9fd8193 100644 --- a/musicutil/process_command.py +++ b/musicutil/commands/process_command.py @@ -1,7 +1,7 @@ -from .types import File, Tags -from .scan_for_music import scan_for_music -from .load_tag_information import load_tag_information -from .substitutions import reduce_to_ascii_and_substitute +from ..types import File, Tags +from ..utils.scan_for_music import scan_for_music +from ..utils.load_tag_information import load_tag_information +from ..utils.substitutions import reduce_to_ascii_and_substitute from copy import deepcopy as deep_copy from os import rename as rename_file diff --git a/musicutil/load_tag_information.py b/musicutil/utils/load_tag_information.py similarity index 93% rename from musicutil/load_tag_information.py rename to musicutil/utils/load_tag_information.py index 18ba648..2c1fae5 100644 --- a/musicutil/load_tag_information.py +++ b/musicutil/utils/load_tag_information.py @@ -1,4 +1,4 @@ -from .types import File, Tags +from ..types import File, Tags from mutagen.mp3 import EasyMP3 as MP3 from mutagen.flac import FLAC diff --git a/musicutil/scan_for_music.py b/musicutil/utils/scan_for_music.py similarity index 87% rename from musicutil/scan_for_music.py rename to musicutil/utils/scan_for_music.py index 3bb799c..e585fbe 100644 --- a/musicutil/scan_for_music.py +++ b/musicutil/utils/scan_for_music.py @@ -1,8 +1,8 @@ from pathlib import Path from os.path import relpath -from .types import File -from .meta import supported_formats +from ..types import File +from ..meta import supported_formats def scan_for_music(src: str) -> list[File]: files: list[File] = [] diff --git a/musicutil/substitutions.py b/musicutil/utils/substitutions.py similarity index 89% rename from musicutil/substitutions.py rename to musicutil/utils/substitutions.py index 7c8b1ff..8c2ddf2 100644 --- a/musicutil/substitutions.py +++ b/musicutil/utils/substitutions.py @@ -1,4 +1,4 @@ -from .meta import sub_char, substitutions +from ..meta import sub_char, substitutions from fold_to_ascii import fold def reduce_to_ascii_and_substitute(filename: str):