django-botmanager 0.2.16__tar.gz → 0.2.18__tar.gz

django_botmanager-0.2.18/MANIFEST.in

@@ -0,0 +1,3 @@
+include README.md
+graft botmanager
+recursive-exclude botmanager/locale *

{django-botmanager-0.2.16/django_botmanager.egg-info → django_botmanager-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-botmanager
-Version: 0.2.16
+Version: 0.2.18
 Summary: Async tasks for django
 Home-page: https://github.com/dimoha/django-botmanager
 Author: Dimoha

{django-botmanager-0.2.16 → django_botmanager-0.2.18}/botmanager/admin.py

@@ -1,8 +1,15 @@
 # -*- coding: utf-8 -*-
+import os
+
 from django.contrib import admin
+from django.http import HttpResponseNotFound, FileResponse
+from django.shortcuts import get_object_or_404
+from django.urls import path
 from django.utils.html import escape
 from django.utils.translation import gettext_lazy as _
 from botmanager.models import Task
+from botmanager import settings
+from botmanager.management.commands.bot_manager import Command
 
 
 class TaskAdmin(admin.ModelAdmin):
@@ -10,6 +17,7 @@ class TaskAdmin(admin.ModelAdmin):
                     'create_dt', 'finish_dt', 'error_field', 'attempt_period', 'attempt_count', 'input_field']
     list_filter = ('is_complete', 'is_failed', 'in_process', 'name')
     search_fields = ('id', 'name')
+    change_form_template = 'botmanager/task/change_form.html'
 
     def get_queryset(self, request):
         qs = super(TaskAdmin, self).get_queryset(request)
@@ -37,4 +45,35 @@ class TaskAdmin(admin.ModelAdmin):
 
     input_field.short_description = _("Вводные данные")
 
+    def get_urls(self):
+        urls = super().get_urls()
+        custom_urls = [
+            path("<path:task_id>/open-logfile/",
+                 self.admin_site.admin_view(self.open_logfile),
+                 name="botmanager_task_open_logfile"),
+        ]
+        return custom_urls + urls
+
+    def open_logfile(self, request, task_id):
+        task = get_object_or_404(Task, pk=task_id)
+        imported_class = [
+            Command.import_from_string(i) for i in settings.MAIN_CONFIG["tasks"].keys()
+            if Command.import_from_string(i).name == task.name
+        ]
+
+        if not imported_class:
+            return HttpResponseNotFound()
+
+        filename = imported_class[0](task).get_log_file_name()
+        dir = settings.MAIN_CONFIG["logs"]["dir"]
+        file_path = os.path.join(dir, filename)
+
+        if os.path.exists(file_path):
+            return FileResponse(open(file_path, "rb"))
+        else:
+            return HttpResponseNotFound()
+
+    open_logfile.short_description = _(u"Открыть файл")
+
+
 admin.site.register(Task, TaskAdmin)

django_botmanager-0.2.18/botmanager/templates/botmanager/task/change_form.html

@@ -0,0 +1,11 @@
+{% extends 'admin/change_form.html' %}
+{% load i18n %}
+
+{% block object-tools-items %}
+  {{ block.super }}
+  <li>
+    <a href="{% url 'admin:botmanager_task_open_logfile' original.pk %}" class="open-logfile">
+      {% translate "Open LogFile" %}
+    </a>
+  </li>
+{% endblock %}

{django-botmanager-0.2.16 → django_botmanager-0.2.18/django_botmanager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-botmanager
-Version: 0.2.16
+Version: 0.2.18
 Summary: Async tasks for django
 Home-page: https://github.com/dimoha/django-botmanager
 Author: Dimoha

{django-botmanager-0.2.16 → django_botmanager-0.2.18}/django_botmanager.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.md
 setup.py
 botmanager/__init__.py
@@ -23,6 +24,7 @@ botmanager/migrations/0009_task_extra_params.py
 botmanager/migrations/0010_auto_20170531_1321.py
 botmanager/migrations/0011_alter_task_create_dt_alter_task_id.py
 botmanager/migrations/__init__.py
+botmanager/templates/botmanager/task/change_form.html
 django_botmanager.egg-info/PKG-INFO
 django_botmanager.egg-info/SOURCES.txt
 django_botmanager.egg-info/dependency_links.txt

{django-botmanager-0.2.16 → django_botmanager-0.2.18}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-botmanager',
-    version='0.2.16',
+    version='0.2.18',
     description='Async tasks for django',
     author='Dimoha',
     author_email='dimoha@controlstyle.ru',
@@ -14,4 +14,8 @@ setup(
         "psutil==5.8.0"
     ],
     packages=find_packages(),
-)
+    include_package_data=True,
+    package_data={
+        '': ['locale/*/LC_MESSAGES/*.mo', 'locale/*/LC_MESSAGES/*.po'],
+    }
+)