Skip to content

Commit

Permalink
formatted project for easier reading (might regret this)
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonLovesDoggo committed Jan 6, 2024
1 parent dbf7324 commit e00f5a9
Show file tree
Hide file tree
Showing 234 changed files with 21,060 additions and 9,586 deletions.
30 changes: 13 additions & 17 deletions .ci.settings.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
COMPRESS_OUTPUT_DIR = 'cache'
STATICFILES_FINDERS += ('compressor.finders.CompressorFinder',)
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
COMPRESS_OUTPUT_DIR = "cache"
STATICFILES_FINDERS += ("compressor.finders.CompressorFinder",)
STATIC_ROOT = os.path.join(BASE_DIR, "static")

CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
}
}
CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'dmoj',
'USER': 'root',
'PASSWORD': 'root',
'HOST': 'localhost',
'PORT': '3306',
'OPTIONS': {
'charset': 'utf8mb4',
"default": {
"ENGINE": "django.db.backends.mysql",
"NAME": "dmoj",
"USER": "root",
"PASSWORD": "root",
"HOST": "localhost",
"PORT": "3306",
"OPTIONS": {
"charset": "utf8mb4",
},
},
}
47 changes: 30 additions & 17 deletions django_ace/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,17 @@


class AceWidget(forms.Textarea):
def __init__(self, mode=None, theme=None, wordwrap=False, width='100%', height='300px',
no_ace_media=False, *args, **kwargs):
def __init__(
self,
mode=None,
theme=None,
wordwrap=False,
width="100%",
height="300px",
no_ace_media=False,
*args,
**kwargs
):
self.mode = mode
self.theme = theme
self.wordwrap = wordwrap
Expand All @@ -23,37 +32,41 @@ def __init__(self, mode=None, theme=None, wordwrap=False, width='100%', height='

@property
def media(self):
js = [urljoin(settings.ACE_URL, 'ace.js')] if self.ace_media else []
js.append('django_ace/widget.js')
js = [urljoin(settings.ACE_URL, "ace.js")] if self.ace_media else []
js.append("django_ace/widget.js")
css = {
'screen': ['django_ace/widget.css'],
"screen": ["django_ace/widget.css"],
}
return forms.Media(js=js, css=css)

def render(self, name, value, attrs=None, renderer=None):
attrs = attrs or {}

ace_attrs = {
'class': 'django-ace-widget loading',
'style': 'width:%s; height:%s' % (self.width, self.height),
'id': 'ace_%s' % name,
"class": "django-ace-widget loading",
"style": "width:%s; height:%s" % (self.width, self.height),
"id": "ace_%s" % name,
}
if self.mode:
ace_attrs['data-mode'] = self.mode
ace_attrs["data-mode"] = self.mode
if self.theme:
ace_attrs['data-theme'] = self.theme
ace_attrs['data-default-light-theme'] = settings.ACE_DEFAULT_LIGHT_THEME
ace_attrs['data-default-dark-theme'] = settings.ACE_DEFAULT_DARK_THEME
ace_attrs["data-theme"] = self.theme
ace_attrs["data-default-light-theme"] = settings.ACE_DEFAULT_LIGHT_THEME
ace_attrs["data-default-dark-theme"] = settings.ACE_DEFAULT_DARK_THEME
if self.wordwrap:
ace_attrs['data-wordwrap'] = 'true'
ace_attrs["data-wordwrap"] = "true"

attrs.update(style='width: 100%; min-width: 100%; max-width: 100%; resize: none')
attrs.update(
style="width: 100%; min-width: 100%; max-width: 100%; resize: none"
)
textarea = super(AceWidget, self).render(name, value, attrs)

html = '<div%s><div></div></div>%s' % (flatatt(ace_attrs), textarea)
html = "<div%s><div></div></div>%s" % (flatatt(ace_attrs), textarea)

# add toolbar
html = ('<div class="django-ace-editor"><div style="width: 100%%" class="django-ace-toolbar">'
'<a href="./" class="django-ace-max_min"></a></div>%s</div>') % html
html = (
'<div class="django-ace-editor"><div style="width: 100%%" class="django-ace-toolbar">'
'<a href="./" class="django-ace-max_min"></a></div>%s</div>'
) % html

return mark_safe(html)
20 changes: 13 additions & 7 deletions dmoj/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,30 @@
from celery import Celery
from celery.signals import task_failure

app = Celery('dmoj')
app = Celery("dmoj")

from django.conf import settings # noqa: E402, I202, django must be imported here
app.config_from_object(settings, namespace='CELERY')

if hasattr(settings, 'CELERY_BROKER_URL_SECRET'):
app.config_from_object(settings, namespace="CELERY")

if hasattr(settings, "CELERY_BROKER_URL_SECRET"):
app.conf.broker_url = settings.CELERY_BROKER_URL_SECRET
if hasattr(settings, 'CELERY_RESULT_BACKEND_SECRET'):
if hasattr(settings, "CELERY_RESULT_BACKEND_SECRET"):
app.conf.result_backend = settings.CELERY_RESULT_BACKEND_SECRET

# Load task modules from all registered Django app configs.
app.autodiscover_tasks()

# Logger to enable reporting of errors.
logger = logging.getLogger('judge.celery')
logger = logging.getLogger("judge.celery")


@task_failure.connect()
def celery_failure_log(sender, task_id, exception, traceback, *args, **kwargs):
logger.error('Celery Task %s: %s on %s', sender.name, task_id, socket.gethostname(), # noqa: G201
exc_info=(type(exception), exception, traceback))
logger.error(
"Celery Task %s: %s on %s",
sender.name,
task_id,
socket.gethostname(), # noqa: G201
exc_info=(type(exception), exception, traceback),
)
Loading

0 comments on commit e00f5a9

Please sign in to comment.