Compare commits

..

No commits in common. "9ed66c2560a8d50a96d830404b9e9d3c7979b6d8" and "f136d6164e5be4cdb8b524dfba8860de078ac092" have entirely different histories.

View File

@ -1,12 +1,10 @@
import os import os
from string import Template from datetime import datetime
from zipfile import ZipFile from zipfile import ZipFile
import discord import discord
from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.dependency_injection import ServiceProviderABC
from cpl_core.environment import ApplicationEnvironmentABC
from cpl_core.logging import LoggingSettings from cpl_core.logging import LoggingSettings
from cpl_core.time import TimeFormatSettings
from cpl_discord.command import DiscordCommandABC from cpl_discord.command import DiscordCommandABC
from cpl_query.extension import List from cpl_query.extension import List
from cpl_translation import TranslatePipe from cpl_translation import TranslatePipe
@ -32,8 +30,6 @@ class LogCommand(DiscordCommandABC):
client_utils: ClientUtilsServiceABC, client_utils: ClientUtilsServiceABC,
translate: TranslatePipe, translate: TranslatePipe,
permissions: PermissionServiceABC, permissions: PermissionServiceABC,
time_format: TimeFormatSettings,
env: ApplicationEnvironmentABC
): ):
DiscordCommandABC.__init__(self) DiscordCommandABC.__init__(self)
@ -45,14 +41,10 @@ class LogCommand(DiscordCommandABC):
self._t = translate self._t = translate
self._permissions = permissions self._permissions = permissions
self._env = env
self._log_settings: LoggingSettings = logging_settings
self._time_format_settings: TimeFormatSettings = time_format
self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}') self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
def _reduce_path(self, p: str) -> str: def _reduce_path(self, p: str) -> str:
if len(p.split('/')) == 1 or p == '': if p.startswith('/') and not p.endswith('/') or p.endswith('/') or p == '':
return p return p
return self._reduce_path(os.path.dirname(p)) return self._reduce_path(os.path.dirname(p))