update import paths

pull/1/head
qwewqa 4 years ago
parent bfb2de981e
commit 466fe36a30
  1. 4
      export_assets.py
  2. 4
      main.py
  3. 2
      miyu_bot/bot/bot.py
  4. 2
      miyu_bot/bot/master_asset_manager.py
  5. 2
      miyu_bot/bot/name_aliases.py
  6. 3
      miyu_bot/commands/cogs/music.py
  7. 2
      miyu_bot/commands/cogs/utility.py
  8. 4
      update_assets.py

@ -1,9 +1,7 @@
import shutil import shutil
from pathlib import Path
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
from miyu_bot.bot.master_asset_manager import hash_master
from miyu_bot.commands.common.asset_paths import * from miyu_bot.commands.common.asset_paths import *

@ -2,7 +2,7 @@ import json
import logging import logging
import discord import discord
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
from miyu_bot.bot.bot import D4DJBot from miyu_bot.bot.bot import D4DJBot
from miyu_bot.bot.master_asset_manager import MasterFilterManager from miyu_bot.bot.master_asset_manager import MasterFilterManager
@ -13,7 +13,7 @@ with open('config.json') as f:
bot_token = json.load(f)['token'] bot_token = json.load(f)['token']
asset_manager = AssetManager('assets') asset_manager = AssetManager('assets')
bot = D4DJBot(asset_manager, MasterFilterManager(asset_manager), command_prefix='!', case_insensitive=True, bot = D4DJBot(asset_manager, MasterFilterManager(asset_manager), command_prefix='?', case_insensitive=True,
activity=discord.Game(name='https://discord.gg/TThMwrAZTR')) activity=discord.Game(name='https://discord.gg/TThMwrAZTR'))
bot.load_extension('miyu_bot.commands.cogs.card') bot.load_extension('miyu_bot.commands.cogs.card')

@ -1,4 +1,4 @@
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
from discord.ext import commands from discord.ext import commands
from miyu_bot.bot.master_asset_manager import MasterFilterManager from miyu_bot.bot.master_asset_manager import MasterFilterManager

@ -1,7 +1,7 @@
import hashlib import hashlib
from typing import Callable, Any, Optional, Union from typing import Callable, Any, Optional, Union
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
from d4dj_utils.master.event_master import EventMaster, EventState from d4dj_utils.master.event_master import EventMaster, EventState
from d4dj_utils.master.master_asset import MasterDict, MasterAsset from d4dj_utils.master.master_asset import MasterDict, MasterAsset
from discord.ext import commands from discord.ext import commands

@ -1,6 +1,6 @@
from functools import cached_property from functools import cached_property
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
class NameAliases: class NameAliases:

@ -235,7 +235,8 @@ class Music(commands.Cog):
f'Duration: {self.format_duration(self.get_music_duration(song))}\n' f'Duration: {self.format_duration(self.get_music_duration(song))}\n'
f'Unit: {song.special_unit_name or song.unit.name}\n' f'Unit: {song.special_unit_name or song.unit.name}\n'
f'Category: {song.category.name}\n' f'Category: {song.category.name}\n'
f'BPM: {song.bpm}', f'BPM: {song.bpm}\n'
f'Designer: {chart.designer.name}',
inline=False) inline=False)
embed.add_field(name='Combo', embed.add_field(name='Combo',
value=f'Max Combo: {chart.note_counts[ChartSectionType.Full].count}\n' value=f'Max Combo: {chart.note_counts[ChartSectionType.Full].count}\n'

@ -40,6 +40,8 @@ class Utility(commands.Cog):
**globals(), **globals(),
} }
self.bot.asset_filters.cards.default_filter
if body and body[0] == '`' and body[-1] == '`': if body and body[0] == '`' and body[-1] == '`':
body = body[1:-1] body = body[1:-1]

@ -2,8 +2,8 @@ import asyncio
import logging import logging
import logging.config import logging.config
from d4dj_utils.manager.asset_manager import AssetManager from d4dj_utils.master.asset_manager import AssetManager
from d4dj_utils.manager.revision_manager import RevisionManager from d4dj_utils.extended.manager.revision_manager import RevisionManager
async def main(): async def main():

Loading…
Cancel
Save