majjo/Vocard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized some code

Browse Source
This commit is contained in:
Choco
2024-07-19 10:45:54 +08:00
parent 8465c78ff4
commit 394c618ab1
3 changed files with 57 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
views/help.py
View File

@@ -56,8 +56,8 @@ class HelpView(discord.ui.View):
self.response: discord.Message = None
self.categorys: list[str] = [ name.capitalize() for name, cog in bot.cogs.items() if len([c for c in cog.walk_commands()]) ]
self.add_item(discord.ui.Button(label='Support', emoji=':support:915152950471581696', url=func.settings.invite_link))
self.add_item(discord.ui.Button(label='Invite', emoji=':invite:915152589056790589', url=f'https://discord.com/oauth2/authorize?client_id={bot.user.id}&permissions=2184260928&scope=bot%20applications.commands'))
self.add_item(discord.ui.Button(label='Website', emoji='🌎', url='https://vocard.xyz'))
self.add_item(discord.ui.Button(label='Document', emoji=':support:915152950471581696', url='https://docs.vocard.xyz'))
self.add_item(discord.ui.Button(label='Github', emoji=':github:1098265017268322406', url='https://github.com/ChocoMeow/Vocard'))
self.add_item(discord.ui.Button(label='Donate', emoji=':patreon:913397909024800878', url='https://www.patreon.com/Vocard'))
self.add_item(HelpDropdown(self.categorys))

151
voicelink/filters.py
View File

@@ -37,10 +37,19 @@ class Filter:
these filters will not work.
"""
def __init__(self):
self.payload: Dict[str, List] = None
self.scope: Dict[str, List] = None
self.payload: Dict[str, float] = None
self.scope: Dict[str, List[int]] = None
self.tag: str = None
def _init_with_scope(self, scope: Dict[str, List[int]], **kwargs):
self.scope = scope
for prop, (min_val, max_val) in scope.items():
setattr(self, prop, kwargs.get(prop, scope[prop][0]))
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"{self.__class__.__name__} {prop} must be between {min_val} and {max_val}.")
self.tag = kwargs.get("tag")
self.payload = {self.__class__.__name__.lower(): {prop: getattr(self, prop) for prop in scope}}
class Filters:
def __init__(self) -> None:
self._filters: List[Filter] = []
@@ -187,18 +196,11 @@ class Timescale(Filter):
rate: float = 1.0
):
super().__init__()
self.scope = {"speed": [0, 5], "pitch": [0, 5], "rate": [0, 5]}
self.speed = speed
self.pitch = pitch
self.rate = rate
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Timescale {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"timescale": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"speed": [0, 5],
"pitch": [0, 5],
"rate": [0, 5]
}, tag=tag, speed=speed, pitch=pitch, rate=rate)
@classmethod
def vaporwave(cls):
@@ -238,19 +240,12 @@ class Karaoke(Filter):
filter_width: float = 100.0
):
super().__init__()
self.scope = {"level": [0, 5], "monoLevel": [0, 5], "filterBand": [0, 500], "filterWidth": [0, 300]}
self.level = level
self.monoLevel = mono_level
self.filterBand = filter_band
self.filterWidth = filter_width
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Karaoke {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"karaoke": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"level": [0, 5],
"monoLevel": [0, 5],
"filterBand": [0, 500],
"filterWidth": [0, 300]
}, tag=tag, level=level, mono_level=mono_level, filter_band=filter_band, filter_width=filter_width)
def __repr__(self):
return (f"<Voicelink.KaraokeFilter tag={self.tag} payload={self.payload}")
@@ -268,17 +263,10 @@ class Tremolo(Filter):
depth: float = 0.5
):
super().__init__()
self.scope = {"frequency": [0, 5], "depth": [0, 1]}
self.frequency = frequency
self.depth = depth
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Tremolo {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"tremolo": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"frequency": [0, 5],
"depth": [0, 1]
}, tag=tag, frequency=frequency, depth=depth)
def __repr__(self):
return f"<Voicelink.TremoloFilter tag={self.tag} payload={self.payload}"
@@ -296,17 +284,10 @@ class Vibrato(Filter):
depth: float = 0.5
):
super().__init__()
self.scope = {"frequency": [0, 14], "depth": [0, 1]}
self.frequency = frequency
self.depth = depth
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Vibrato {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"vibrato": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"frequency": [0, 14],
"depth": [0, 1]
}, tag=tag, frequenc=frequency, depth=depth)
def __repr__(self):
return f"<Voicelink.VibratoFilter tag={self.tag} payload={self.payload}"
@@ -318,16 +299,9 @@ class Rotation(Filter):
def __init__(self, *, tag: str = "rotation", rotation_hertz: float = 5):
super().__init__()
self.scope = {"rotationHz": [0, 10]}
self.rotationHz = rotation_hertz
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Rotation {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"rotation": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"rotationHz": [0, 10]
}, tag=tag, rotationHz=rotation_hertz)
@classmethod
def nightD(cls):
@@ -336,7 +310,6 @@ class Rotation(Filter):
def __repr__(self) -> str:
return f"<Voicelink.RotationFilter tag={self.tag} payload={self.payload}"
class ChannelMix(Filter):
"""Filter which manually adjusts the panning of the audio, which can make
for some cool effects when done correctly.
@@ -352,24 +325,12 @@ class ChannelMix(Filter):
right_to_left: float = 0
):
super().__init__()
self.scope = {
self._init_with_scope({
"leftToLeft": [0, 1],
"leftToRight": [0, 1],
"rightToLeft": [0, 1],
"rightToRight": [0, 1]
}
self.leftToLeft = left_to_left
self.leftToRight = right_to_right
self.rightToLeft = left_to_right
self.rightToRight = right_to_left
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"ChannelMix {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"channelMix": {prop: getattr(self, prop) for prop in self.scope}}
}, tag=tag, leftToLeft=left_to_left, leftToRight=left_to_right, rightToLeft=right_to_left, rightToRight=right_to_right)
def __repr__(self) -> str:
return (f"<Voicelink.ChannelMix tag={self.tag} payload={self.payload}")
@@ -393,8 +354,7 @@ class Distortion(Filter):
scale: float = 1
):
super().__init__()
self.scope = {
self._init_with_scope({
"sinOffset": [0, 1],
"sinScale": [0, 1],
"cosOffset": [0, 1],
@@ -403,22 +363,16 @@ class Distortion(Filter):
"tanScale": [0, 1],
"offset": [0, 1],
"scale": [0, 1],
}
self.sinOffset = sin_offset
self.sinScale = sin_scale
self.cosOffset = cos_offset
self.cosScale = cos_scale
self.tanOffset = tan_offset
self.tanScale = tan_scale
self.offset = offset
self.scale = scale
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"Distortion {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"distortion": {prop: getattr(self, prop) for prop in self.scope}}
},
tag = tag,
sinOffset = sin_offset,
sinScale = sin_scale,
cosOffset = cos_offset,
cosScale = cos_scale,
tanOffset = tan_offset,
tanScale = tan_scale,
offset = offset,
scale = scale)
def __repr__(self) -> str:
return (f"<Voicelink.Distortion tag={self.tag} payload={self.payload}")
@@ -430,16 +384,9 @@ class LowPass(Filter):
def __init__(self, *, tag: str = "lowpass", smoothing: float = 20):
super().__init__()
self.scope = {"smoothing": [0, 100]}
self.smoothing = smoothing
for prop, (min_val, max_val) in self.scope.items():
if not min_val <= getattr(self, prop) <= max_val:
raise FilterInvalidArgument(f"LowPass {prop} must be between {min_val} and {max_val}.")
self.tag = tag
self.payload = {"lowPass": {prop: getattr(self, prop) for prop in self.scope}}
self._init_with_scope({
"smoothing": [0, 100]
}, tag = tag, smoothing = smoothing)
def __repr__(self) -> str:
return f"<Voicelink.LowPass tag={self.tag} payload={self.payload}>"

12
voicelink/spotify/client.py
View File

@@ -26,7 +26,7 @@ import time
import aiohttp
from base64 import b64encode
from typing import List, Union
from typing import List, Union, Dict, Any
from .objects import Track, Album, Artist, Playlist, Category
from .exceptions import InvalidSpotifyURL, SpotifyRequestException
@@ -54,8 +54,8 @@ class Client:
self._bearer_token: str = None
self._expiry: int = 0
self._auth_token: str = b64encode(f"{self._client_id}:{self._client_secret}".encode())
self._grant_headers: dict[str, str] = {"Authorization": f"Basic {self._auth_token.decode()}"}
self._bearer_headers: dict[str, str] = None
self._grant_headers: Dict[str, str] = {"Authorization": f"Basic {self._auth_token.decode()}"}
self._bearer_headers: Dict[str, str] = None
self._categories: List[Category] = []
@@ -68,13 +68,13 @@ class Client:
f"Error fetching bearer token: {resp.status} {resp.reason}"
)
data: dict = await resp.json()
data: Dict = await resp.json()
self._bearer_token = data["access_token"]
self._expiry = time.time() + (int(data["expires_in"]) - 10)
self._bearer_headers = {"Authorization": f"Bearer {self._bearer_token}"}
async def get_request(self, url: str) -> dict:
async def get_request(self, url: str) -> Dict:
if not self._bearer_token or time.time() >= self._expiry:
await self._fetch_bearer_token()
@@ -134,7 +134,7 @@ class Client:
f"Error while fetching results: {resp.status} {resp.reason}"
)
next_data: dict = await resp.json()
next_data: Dict = await resp.json()
tracks += [
Track(track["track"])