diff --git a/Controllers/ControllerResponse.py b/Controllers/ControllerResponse.py index 9aa6da1..09cf7f3 100644 --- a/Controllers/ControllerResponse.py +++ b/Controllers/ControllerResponse.py @@ -1,13 +1,13 @@ from typing import Union from discord.ext.commands import Context -from Exceptions.Exceptions import Error +from Exceptions.Exceptions import VulkanError from discord import Embed class ControllerResponse: - def __init__(self, ctx: Context, embed: Embed = None, error: Error = None) -> None: + def __init__(self, ctx: Context, embed: Embed = None, error: VulkanError = None) -> None: self.__ctx: Context = ctx - self.__error: Error = error + self.__error: VulkanError = error self.__embed: Embed = embed self.__success = False if error else True @@ -19,7 +19,7 @@ class ControllerResponse: def embed(self) -> Union[Embed, None]: return self.__embed - def error(self) -> Union[Error, None]: + def error(self) -> Union[VulkanError, None]: return self.__error @property diff --git a/Controllers/MoveController.py b/Controllers/MoveController.py index c4c06eb..e5292f0 100644 --- a/Controllers/MoveController.py +++ b/Controllers/MoveController.py @@ -3,7 +3,7 @@ from discord.ext.commands import Context from discord import Client from Controllers.AbstractController import AbstractController from Controllers.ControllerResponse import ControllerResponse -from Exceptions.Exceptions import BadCommandUsage, Error, InvalidInput, NumberRequired, UnknownError, WrongLength +from Exceptions.Exceptions import BadCommandUsage, VulkanError, InvalidInput, NumberRequired, UnknownError from Music.Downloader import Downloader @@ -44,7 +44,7 @@ class MoveController(AbstractController): error = UnknownError() return ControllerResponse(self.ctx, embed, error) - def __validate_input(self, pos1: str, pos2: str) -> Union[Error, None]: + def __validate_input(self, pos1: str, pos2: str) -> Union[VulkanError, None]: try: pos1 = int(pos1) pos2 = int(pos2) diff --git a/Controllers/PlayController.py b/Controllers/PlayController.py index 693bfea..66356ed 100644 --- a/Controllers/PlayController.py +++ b/Controllers/PlayController.py @@ -1,5 +1,5 @@ import asyncio -from Exceptions.Exceptions import DownloadingError, Error +from Exceptions.Exceptions import DownloadingError, VulkanError from discord.ext.commands import Context from discord import Client from Controllers.AbstractController import AbstractController @@ -64,7 +64,7 @@ class PlayController(AbstractController): return response except Exception as err: - if isinstance(err, Error): + if isinstance(err, VulkanError): # If error was already processed print(f'DEVELOPER NOTE -> PlayController Error: {err.message}') error = err embed = self.embeds.CUSTOM_ERROR(error) diff --git a/Controllers/RemoveController.py b/Controllers/RemoveController.py index 731ba6d..97bf73d 100644 --- a/Controllers/RemoveController.py +++ b/Controllers/RemoveController.py @@ -3,7 +3,7 @@ from discord.ext.commands import Context from discord import Client from Controllers.AbstractController import AbstractController from Controllers.ControllerResponse import ControllerResponse -from Exceptions.Exceptions import BadCommandUsage, Error, ErrorRemoving, InvalidInput, NumberRequired, UnknownError +from Exceptions.Exceptions import BadCommandUsage, VulkanError, ErrorRemoving, InvalidInput, NumberRequired class RemoveController(AbstractController): @@ -38,7 +38,7 @@ class RemoveController(AbstractController): embed = self.embeds.ERROR_REMOVING() return ControllerResponse(self.ctx, embed, error) - def __validate_input(self, position: str) -> Union[Error, None]: + def __validate_input(self, position: str) -> Union[VulkanError, None]: try: position = int(position) except: diff --git a/Exceptions/Exceptions.py b/Exceptions/Exceptions.py index 2a80acd..6c29478 100644 --- a/Exceptions/Exceptions.py +++ b/Exceptions/Exceptions.py @@ -1,8 +1,7 @@ -from Config.Configs import Configs from Config.Messages import Messages -class Error(Exception): +class VulkanError(Exception): def __init__(self, message='', title='', *args: object) -> None: self.__message = message self.__title = title @@ -17,7 +16,7 @@ class Error(Exception): return self.__title -class ImpossibleMove(Error): +class ImpossibleMove(VulkanError): def __init__(self, message='', title='', *args: object) -> None: message = Messages() if title == '': @@ -25,56 +24,56 @@ class ImpossibleMove(Error): super().__init__(message, title, *args) -class MusicUnavailable(Error): +class MusicUnavailable(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class YoutubeError(Error): +class YoutubeError(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class BadCommandUsage(Error): +class BadCommandUsage(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class DownloadingError(Error): +class DownloadingError(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class SpotifyError(Error): +class SpotifyError(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class UnknownError(Error): +class UnknownError(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class InvalidInput(Error): +class InvalidInput(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class WrongLength(Error): +class WrongLength(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class ErrorMoving(Error): +class ErrorMoving(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class ErrorRemoving(Error): +class ErrorRemoving(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) -class NumberRequired(Error): +class NumberRequired(VulkanError): def __init__(self, message='', title='', *args: object) -> None: super().__init__(message, title, *args) diff --git a/Tests/VSpotifyTests.py b/Tests/VSpotifyTests.py index ad5235c..7220319 100644 --- a/Tests/VSpotifyTests.py +++ b/Tests/VSpotifyTests.py @@ -1,5 +1,3 @@ -from requests import HTTPError -from Music.Spotify import SpotifySearch from Tests.TestBase import VulkanTesterBase from Exceptions.Exceptions import SpotifyError diff --git a/Views/Embeds.py b/Views/Embeds.py index 0fea62a..23571ee 100644 --- a/Views/Embeds.py +++ b/Views/Embeds.py @@ -1,5 +1,5 @@ from Config.Messages import Messages -from Exceptions.Exceptions import Error +from Exceptions.Exceptions import VulkanError from discord import Embed from Config.Configs import Configs from Config.Colors import Colors @@ -130,7 +130,7 @@ class Embeds: ) return embed - def CUSTOM_ERROR(self, error: Error) -> Embed: + def CUSTOM_ERROR(self, error: VulkanError) -> Embed: embed = Embed( title=error.title, description=error.message,