]> git.ipfire.org Git - pbs.git/commitdiff
Drop old logging stuff
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Oct 2022 10:42:04 +0000 (10:42 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Oct 2022 10:42:04 +0000 (10:42 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
src/buildservice/logs.py [deleted file]
src/templates/modules/build-log.html [deleted file]
src/templates/modules/log-entry-comment.html [deleted file]
src/templates/modules/log-entry-small.html [deleted file]
src/templates/modules/log-entry.html [deleted file]
src/templates/modules/log-table.html [deleted file]
src/templates/modules/log.html [deleted file]
src/web/__init__.py
src/web/ui_modules.py

index c3ac0574c0a7971bba8950ba5bd0f7b563731bfd..889f7ae809bf458ae5be807b3c8ae8c8ab578040 100644 (file)
@@ -99,7 +99,6 @@ buildservice_PYTHON = \
        src/buildservice/jobs.py \
        src/buildservice/keys.py \
        src/buildservice/ldap.py \
-       src/buildservice/logs.py \
        src/buildservice/messages.py \
        src/buildservice/mirrors.py \
        src/buildservice/misc.py \
@@ -264,7 +263,6 @@ templates_mirrorsdir = $(templatesdir)/mirrors
 
 dist_templates_modules_DATA = \
        src/templates/modules/build-headline.html \
-       src/templates/modules/build-log.html \
        src/templates/modules/build-offset.html \
        src/templates/modules/build-state-warnings.html \
        src/templates/modules/build-table.html \
@@ -273,12 +271,7 @@ dist_templates_modules_DATA = \
        src/templates/modules/files-table.html \
        src/templates/modules/jobs-table.html \
        src/templates/modules/link-to-user.html \
-       src/templates/modules/log-entry-comment.html \
-       src/templates/modules/log-entry.html \
-       src/templates/modules/log-entry-small.html \
        src/templates/modules/log-files-table.html \
-       src/templates/modules/log.html \
-       src/templates/modules/log-table.html \
        src/templates/modules/modal-base.html \
        src/templates/modules/modal-build-comment.html \
        src/templates/modules/modal-build-push.html \
diff --git a/src/buildservice/logs.py b/src/buildservice/logs.py
deleted file mode 100644 (file)
index 7dc5dec..0000000
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-from . import base
-
-_ = lambda x: x
-
-class LogEntry(base.Object):
-       type = None
-
-       def __init__(self, pakfire, data):
-               base.Object.__init__(self, pakfire)
-
-               self.data = data
-
-               self._user = None
-
-       def __eq__(self):
-               if isinstance(other, self.__class__):
-                       return False
-
-               return NotImplemented
-
-       def __lt__(self, other):
-               if issubclass(other.__class__, LogEntry):
-                       return other.time < self.time
-
-               return NotImplemented
-
-       @property
-       def time(self):
-               return self.data.time
-
-       def get_user(self):
-               user_id = getattr(self.data, "user_id", None)
-
-               if user_id is None:
-                       return
-
-               return self.pakfire.users.get_by_id(self.data.user_id)
-
-       @property
-       def user(self):
-               if self._user is None:
-                       self._user = self.get_user()
-
-               return self._user
-
-       def get_title(self, user=None):
-               return None
-
-       def get_message(self, user=None):
-               raise NotImplementedError
-
-       def get_footer(self, user=None):
-               return None
-
-
-class CreatedLogEntry(LogEntry):
-       type = "created"
-
-       @property
-       def build(self):
-               return self.data
-
-       @property
-       def time(self):
-               return self.build.created
-
-       def get_user(self):
-               if self.build.type == "scratch":
-                       return self.build.owner
-
-       def get_message(self, user=None):
-               return _("Build has been created")
-
-
-class CommentLogEntry(LogEntry):
-       type = "comment"
-
-       @property
-       def time(self):
-               return self.data.time_created
-
-       @property
-       def score(self):
-               return self.data.score
-
-       @property
-       def build_id(self):
-               return self.data.build_id
-
-       @property
-       def build(self):
-               return self.pakfire.builds.get_by_id(self.build_id)
-
-       @property
-       def vote(self):
-               if self.score > 0:
-                       return "up"
-               elif self.score < 0:
-                       return "down"
-
-               return "none"
-
-       def get_message(self, user=None):
-               return self.data.text
-
-
-class RepositoryLogEntry(LogEntry):
-       type = "repo"
-
-       def get_message(self, user=None):
-               msg = _("Unknown action.")
-
-               # See if we have done the action by ourself.
-               you = self.user == user
-
-               args = {}
-
-               # Add information about the user.
-               if self.user:
-                       args["user"] = self.user.realname
-               else:
-                       args["user"] = _("Unknown")
-
-               # Add information about the repositories.
-               if self.data.from_repo_id:
-                       repo = self.pakfire.repos.get_by_id(self.data.from_repo_id)
-                       args["from_repo"] = repo.name
-               else:
-                       args["from_repo"] = _("N/A")
-
-               if self.data.to_repo_id:
-                       repo = self.pakfire.repos.get_by_id(self.data.to_repo_id)
-                       args["to_repo"] = repo.name
-               else:
-                       args["to_repo"] = _("N/A")
-
-               action = self.data.action
-
-               if action == "added":
-                       if not self.user:
-                               msg = _("This build was pushed to the repository '%(to_repo)s'.")
-                       elif you:
-                               msg = _("You pushed this build to the repository '%(to_repo)s'.")
-                       else:
-                               msg = _("%(user)s pushed this build to the repository '%(to_repo)s'.")
-
-               elif action == "removed":
-                       if not self.user:
-                               msg = _("This build was unpushed from the repository '%(from_repo)s'.")
-                       elif you:
-                               msg = _("You unpushed this build from the repository '%(from_repo)s'.")
-                       else:
-                               msg = _("%(user)s unpushed this build from the repository '%(from_repo)s'.")
-
-               elif action == "moved":
-                       if not self.user:
-                               msg = _("This build was pushed from the repository '%(from_repo)s' to '%(to_repo)s'.")
-                       elif you:
-                               msg = _("You pushed this build from the repository '%(from_repo)s' to '%(to_repo)s'.")
-                       else:
-                               msg = _("%(user)s pushed this build from the repository '%(from_repo)s' to '%(to_repo)s'.")
-
-               return msg % args
-
-
-class BuilderLogEntry(LogEntry):
-       type = "builder"
-
-       def get_builder(self):
-               assert self.data.builder_id
-
-               return self.pakfire.builders.get_by_id(self.data.builder_id)
-
-       def get_message(self, user=None):
-               msg = _("Unknown action.")
-
-               # See if we have done the action by ourself.
-               you = self.user == user
-
-               builder = self.get_builder()
-               assert builder
-
-               args = {
-                       "builder" : builder.hostname,
-               }
-
-               # Add information about the user.
-               if self.user:
-                       args["user"] = self.user.realname
-               else:
-                       args["user"] = _("Unknown")
-
-               action = self.data.action
-
-               if action == "enabled":
-                       if not self.user:
-                               msg = _("Builder '%(builder)s' has been enabled.")
-                       elif you:
-                               msg = _("You enabled builder '%(builder)s'.")
-                       else:
-                               msg = _("%(user)s enabled builder '%(builder)s'.")
-
-               elif action == "disabled":
-                       if not self.user:
-                               msg = _("Builder '%(builder)s' has been disabled.")
-                       elif you:
-                               msg = _("You disabled builder '%(builder)s'.")
-                       else:
-                               msg = _("%(user)s disabled builder '%(builder)s'.")
-
-               elif action == "deleted":
-                       if you:
-                               msg = _("You deleted builder '%(builder)s'.")
-                       else:
-                               msg = _("%(user)s deleted builder '%(builder)s'.")
-
-               elif action == "created":
-                       if you:
-                               msg = _("You created builder '%(builder)s'.")
-                       else:
-                               msg = _("%(user)s created builder '%(builder)s'.")
-
-               return msg % args
-
-
-class JobLogEntry(LogEntry):
-       type = "job"
-
-       def get_job(self):
-               assert self.data.job_id
-
-               return self.pakfire.jobs.get_by_id(self.data.job_id)
-
-       def get_message(self, user=None):
-               msg = _("Unknown action.")
-
-               # See if we have done the action by ourself.
-               you = self.user == user
-
-               job = self.get_job()
-               assert job
-
-               args = {
-                       "job"   : job.name,
-                       "state" : self.data.state,
-               }
-
-               # Add information about the user.
-               if self.user:
-                       args["user"] = self.user.realname
-               else:
-                       args["user"] = _("Unknown")
-
-               action = self.data.action
-
-               if action == "created":
-                       if not self.user:
-                               msg = _("Job '%(job)s' has been created.")
-                       elif you:
-                               msg = _("You created job '%(job)s'.")
-                       else:
-                               msg = _("%(user)s created job '%(job)s'.")
-
-               elif action == "state_change":
-                       if not self.user:
-                               msg = _("Job '%(job)s' has changed its state to: %(state)s.")
-                       elif you:
-                               msg = _("You changed the state of job '%(job)s' to: %(state)s.")
-                       else:
-                               msg = _("%(user)s changed the state of job '%(job)s' to: %(state)s.")
-
-               elif action == "reset":
-                       if not self.user:
-                               msg = _("Job '%(job)s' has been reset.")
-                       elif you:
-                               msg = _("You reset job '%(job)s'.")
-                       else:
-                               msg = _("%(user)s has reset job '%(job)s'.")
-
-               elif action == "schedule_rebuild":
-                       if not self.user:
-                               msg = _("Job '%(job)s' has been scheduled for rebuild.")
-                       elif you:
-                               msg = _("You scheduled job '%(job)s' for rebuild.")
-                       else:
-                               msg = _("%(user)s scheduled job '%(job)s' for rebuild.")
-
-               elif action == "schedule_test_job":
-                       # XXX add link to the test job
-
-                       if not self.user:
-                               msg = _("A test job for '%(job)s' has been scheduled.")
-                       elif you:
-                               msg = _("You scheduled a test job for '%(job)s'.")
-                       else:
-                               msg = _("%(user)s scheduled a test job for '%(job)s'.")
-
-               return msg % args
-
-
-class MirrorLogEntry(LogEntry):
-       type = "mirror"
-
-       def get_mirror(self):
-               assert self.data.mirror_id
-
-               return self.pakfire.mirrors.get_by_id(self.data.mirror_id)
-
-       def get_message(self, user=None):
-               msg = _("Unknown action.")
-
-               # See if we have done the action by ourself.
-               you = self.user == user
-
-               mirror = self.get_mirror()
-               assert mirror
-
-               args = {
-                       "mirror" : mirror.hostname,
-               }
-
-               # Add information about the user.
-               if self.user:
-                       args["user"] = self.user.realname
-               else:
-                       args["user"] = _("Unknown")
-
-               action = self.data.action
-
-               if action == "enabled":
-                       if not self.user:
-                               msg = _("Mirror '%(mirror)s' has been enabled.")
-                       elif you:
-                               msg = _("You enabled mirror '%(mirror)s'.")
-                       else:
-                               msg = _("%(user)s enabled mirror '%(mirror)s'.")
-
-               elif action == "disabled":
-                       if not self.user:
-                               msg = _("Mirror '%(mirror)s' has been disabled.")
-                       elif you:
-                               msg = _("You disabled mirror '%(mirror)s'.")
-                       else:
-                               msg = _("%(user)s disabled mirror '%(mirror)s'.")
-
-               elif action == "deleted":
-                       if you:
-                               msg = _("You deleted mirror '%(mirror)s'.")
-                       else:
-                               msg = _("%(user)s deleted mirror '%(mirror)s'.")
-
-               elif action == "created":
-                       if you:
-                               msg = _("You created mirror '%(mirror)s'.")
-                       else:
-                               msg = _("%(user)s created mirror '%(mirror)s'.")
-
-               return msg % args
-
-
-class LogFile(base.Object):
-       def __init__(self, pakfire, id):
-               base.Object.__init__(self, pakfire)
-
-               # Save the ID of the item.
-               self.id = id
-
-               # Cache.
-               self._data = None
-               self._job = None
-
-       @property
-       def data(self):
-               if self._data is None:
-                       self._data = self.db.get("SELECT * FROM logfiles WHERE id = %s", self.id)
-                       assert self._data
-
-               return self._data
-
-       @property
-       def name(self):
-               return os.path.basename(self.path)
-
-       @property
-       def path(self):
-               return self.data.path
-
-       @property
-       def job(self):
-               if self._job is None:
-                       self._job = self.pakfire.jobs.get_by_id(self.data.job_id)
-                       assert self._job
-
-               return self._job
-
-       @property
-       def build(self):
-               return self.job.build
-
-       @property
-       def download_url(self):
-               return "/".join((self.build.download_prefix, self.path))
-
-       @property
-       def filesize(self):
-               return self.data.filesize
diff --git a/src/templates/modules/build-log.html b/src/templates/modules/build-log.html
deleted file mode 100644 (file)
index 89e5bd9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<table class="build-log">
-       {% for message in messages %}
-               <tr>
-                       <td>
-                               {{ message.time }}
-                       </td>
-                       <td>
-                               {{ message.message }}
-                       </td>
-               </tr>
-       {% end %}
-</table>
diff --git a/src/templates/modules/log-entry-comment.html b/src/templates/modules/log-entry-comment.html
deleted file mode 100644 (file)
index ca5a4a8..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "log-entry.html" %}
-
-{% block extra-title %}
-       {% if entry.vote == "up" %}
-               <span class="label label-success" title="{{ _("This build works for %s.") % entry.user.firstname }}">
-                       +{{ entry.score }}
-               </span>
-               &dash;
-       {% elif entry.vote == "down" %}
-               <span class="label label-important" title="{{ _("This build does not work for %s.") % entry.user.firstname }}">
-                       {{ entry.score }}
-               </span>
-               &dash;
-       {% end %}
-{% end %}
-
-{% block message %}
-       {% if entry.get_message(current_user) %}
-               {% module Text(entry.get_message(current_user)) %}
-       {% else %}
-               <p class="muted">
-                       {{ _("No comment given.") }}
-               </p>
-       {% end %}
-{% end %}
diff --git a/src/templates/modules/log-entry-small.html b/src/templates/modules/log-entry-small.html
deleted file mode 100644 (file)
index 5ea2af6..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<li class="media mt-3 mb-3">
-
-       <div class="media-body">
-               <p class="text-muted float-md-right float-lg-right float-xl-right">
-                       {{ format_date(entry.time) }}
-               </p>
-
-               {% module Text(entry.get_message(current_user)) %}
-       </div>
-</li>
diff --git a/src/templates/modules/log-entry.html b/src/templates/modules/log-entry.html
deleted file mode 100644 (file)
index c55c46b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<li class="media mt-3 mb-3">
-       {% block body %}
-               {% if u %}
-                       <!--<a class="pull-left hidden-phone" href="/user/{{ u.name }}">
-                               </a>
-                       -->
-                       <img class="mr-3" src="{{ u.avatar(96) }}" alt="{{ u.realname }}">
-               {% end %}
-               <div class="media-body">
-
-                       {% block title %}
-                               <p class="text-muted float-md-right float-lg-right float-xl-right">
-                                       {% block extra-title %}{% end block %}
-                                       {{ format_date(entry.time) }}
-                               </p>
-
-                               {% if entry.user %}
-                                       <h4>
-                                               {% if current_user == entry.user %}
-                                                       <a href="/profile">{{ _("You") }}</a>
-                                               {% else %}
-                                                       <a href="/user/{{ entry.user.name }}">{{ entry.user.realname }}</a>
-                                               {% end %}
-
-                                               {% if show_build %}
-                                                       <small>-
-                                                               <a href="/build/{{ entry.build.uuid }}">{{ entry.build.name }}</a>
-                                                       </small>
-                                               {% end %}
-                                       </h4>
-                               {% end %}
-                       {% end block %}
-
-                       {% block message %}
-                               {% module Text(entry.get_message(current_user)) %}
-                       {% end block %}
-               </div>
-       {% end block %}
-</li>
diff --git a/src/templates/modules/log-table.html b/src/templates/modules/log-table.html
deleted file mode 100644 (file)
index b9bf469..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<table class="log">
-       {% if messages %}
-               {% for message in messages %}
-                       <tr>
-                               <td>
-                                       {{ locale.format_date(message.time, relative=False, full_format=True) }}
-                               </td>
-                               <td class="links">
-                                       {% if hasattr(message, "build") %}
-                                               [<a href="/build/{{ message.build.uuid }}">{{ _("Build") }}: {{ message.build.name }}</a>]
-                                       {% elif hasattr(message, "pkg") %}
-                                               [{{ _("Package") }}: {{ message.pkg.friendly_name }}]
-                                       {% end %}
-                               </td>
-                               <td>
-                                       {{ message.message }}
-                               </td>
-                       </tr>
-               {% end %}
-       {% else %}
-               <tr>
-                       <td colspan="3">
-                               {{ _("No log entries, yet.") }}
-                       </td>
-               </tr>
-       {% end %}
-</table>
-<div style="clear: both;">&nbsp;</div>
diff --git a/src/templates/modules/log.html b/src/templates/modules/log.html
deleted file mode 100644 (file)
index 99203ac..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="table-responsive">
-       <ul class="list-unstyled">
-               {% for entry in entries %}
-                       {% if entry.type == "comment" %}
-                               {% module LogEntryComment(entry, **args) %}
-                       {% else %}
-                               {% module LogEntry(entry, **args) %}
-                       {% end %}
-               {% end %}
-       </ul>
-</div>
\ No newline at end of file
index 65bbd50386b55335dc21abba877b64f93e2fef27..31c5f136242462bc93cacc3f2c45b99cdc059773 100644 (file)
@@ -40,11 +40,6 @@ class Application(tornado.web.Application):
                                "Text"               : ui_modules.TextModule,
                                "Modal"              : ui_modules.ModalModule,
 
-                               # Logging
-                               "Log"                : ui_modules.LogModule,
-                               "LogEntry"           : ui_modules.LogEntryModule,
-                               "LogEntryComment"    : ui_modules.LogEntryCommentModule,
-
                                # Bugs
                                "BugsList"           : bugs.ListModule,
 
@@ -53,7 +48,6 @@ class Application(tornado.web.Application):
                                "BuildStateWarnings" : ui_modules.BuildStateWarningsModule,
                                "BuildState"         : ui_modules.BuildState,
 
-                               "BuildLog"           : ui_modules.BuildLogModule,
                                "BuildOffset"        : ui_modules.BuildOffsetModule,
                                "BuildTable"         : ui_modules.BuildTableModule,
 
@@ -83,7 +77,6 @@ class Application(tornado.web.Application):
                                "JobsTable"          : ui_modules.JobsTableModule,
                                "FilesTable"         : ui_modules.FilesTableModule,
                                "LinkToUser"         : ui_modules.LinkToUserModule,
-                               "LogTable"           : ui_modules.LogTableModule,
                                "LogFilesTable"      : ui_modules.LogFilesTableModule,
                                "PackagesTable"      : ui_modules.PackagesTableModule,
                                "PackageTable2"      : ui_modules.PackageTable2Module,
index df86a3014faad59f601aecb371adf37a0313f09e..1361efd98572c88f1a200e92151419a9a58fd03e 100644 (file)
@@ -298,67 +298,11 @@ class SourceTableModule(UIModule):
                        distro=distro, sources=sources)
 
 
-class LogModule(UIModule):
-       def render(self, entries, **args):
-               return self.render_string("modules/log.html",
-                       entries=entries, args=args)
-
-
-class LogEntryModule(UIModule):
-       def render(self, entry, small=None, **args):
-               if small or not entry.user:
-                       template = "modules/log-entry-small.html"
-               else:
-                       template = "modules/log-entry.html"
-
-               return self.render_string(template, entry=entry, u=entry.user,
-                       show_build=False, **args)
-
-
-class LogEntryCommentModule(LogEntryModule):
-       def render(self, entry, show_build=False, **args):
-               return self.render_string("modules/log-entry-comment.html",
-                       entry=entry, u=entry.user, show_build=show_build, **args)
-
-
 class LinkToUserModule(UIModule):
        def render(self, user):
                return self.render_string("modules/link-to-user.html", user=user, users=users)
 
 
-class BuildLogModule(UIModule):
-       # XXX deprecated
-       def render(self, messages):
-               _ = self.locale.translate
-
-               for message in messages:
-                       try:
-                               msg = LOG2MSG[message.message]
-                               message["message"] = _(msg)
-                       except KeyError:
-                               pass
-
-               return self.render_string("modules/build-log.html", messages=messages)
-
-
-class LogTableModule(UIModule):
-       def render(self, messages, links=["pkg",]):
-               for message in messages:
-                       try:
-                               message["message"] = LOG2MSG[message.message]
-                       except KeyError:
-                               pass
-
-                       if message.build_id:
-                               message["build"] = self.backend.builds.get_by_id(message.build_id)
-
-                       elif message.pkg_id:
-                               message["pkg"] = self.backend.packages.get_by_id(message.pkg_id)
-
-               return self.render_string("modules/log-table.html",
-                       messages=messages, links=links)
-
-
 class BuildOffsetModule(UIModule):
        def render(self):
                return self.render_string("modules/build-offset.html")