web: Drop the unused FileDetail Handler

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index b12f66cef5e976d3f3f2c803cffa7b2b991e557e..db110c179d369df17725d13a263df58e8c5cf70d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,7 +164,6 @@ dist_templates_DATA = \
        src/templates/distro-source-detail.html \
        src/templates/distro-update-detail.html \
        src/templates/distro-update-edit.html \
-       src/templates/file-detail.html \
        src/templates/index.html \
        src/templates/jobs-abort.html \
        src/templates/jobs-buildroot.html \

diff --git a/src/templates/file-detail.html b/src/templates/file-detail.html
deleted file mode 100644 (file)
index b5a2524..0000000
--- a/src/templates/file-detail.html
+++ /dev/null
@@ -1,120 +0,0 @@
-{% extends "base.html" %}
-
-{% block body %}
-       <h1>
-               {{ _("File") }}:
-               <a href="/package/{{ pkg.name }}/{{ pkg.epoch }}/{{ pkg.version }}/{{ pkg.release }}">{{ file.name }}</a>
-       </h1>
-
-       <p class="pkg-summary">{{ file.summary or pkg.summary }}</p>
-
-       <table class="form form2">
-               <tr>
-                       <td class="col1">{{ _("Package") }}</td>
-                       <td class="col2">
-                               <a href="/package/{{ pkg.name }}/{{ pkg.epoch }}/{{ pkg.version }}/{{ pkg.release }}">{{ pkg.friendly_name }}</a>
-                       </td>
-               </tr>
-
-               <tr>
-                       <td colspan="2">{{ _("Description") }}</td>
-               </tr>
-               <tr>
-                       <td colspan="2">{{ file.description or pkg.description }}</td>
-               </tr>
-
-               <tr>
-                       <td class="col1">{{ _("URL") }}</td>
-                       <td class="col2">
-                               <a href="{{ pkg.url }}" target="_blank">{{ file.url or pkg.url }}</a>
-                       </td>
-               </tr>
-
-               <tr>
-                       <td class="col1">{{ _("License") }}</td>
-                       <td class="col2">{{ file.license or pkg.license}}</td>
-               </tr>
-
-               {% if file.maintainer %}
-                       <tr>
-                               <td class="col1">{{ _("Maintainer") }}</td>
-                               <td class="col2">{{ file.maintainer or pkg.maintainer }}</td>
-                       </tr>
-               {% end %}
-
-               <tr>
-                       <td class="col1">{{ _("Size") }}</td>
-                       <td class="col2">{{ friendly_size(file.size) }}</td>
-               </tr>
-
-               <tr>
-                       <td class="col1">{{ _("Hash") }}</td>
-                       <td class="col2">{{ file.hash1 }}</td>
-               </tr>
-
-               {% for i in file.provides %}
-                       <tr>
-                               <td class="col1">{{ _("Provides") }}</td>
-                               <td class="col2">{{ i }}</td>
-                       </tr>
-               {% end %}
-
-               <tr>
-                       <td class="col1">{{ _("Requires") }}</td>
-                       <td class="col2">{{ "<br />".join(file.requires) }}</td>
-               </tr>
-
-               {% for i in file.requires %}
-                       <tr>
-                               <td class="col1">{{ _("Requires") }}</td>
-                               <td class="col2">{{ i }}</td>
-                       </tr>
-               {% end %}
-
-               {% for i in file.obsoletes %}
-                       <tr>
-                               <td class="col1">{{ _("Obsoletes") }}</td>
-                               <td class="col2">{{ i }}</td>
-                       </tr>
-               {% end %}
-
-               {% for i in file.conflicts %}
-                       <tr>
-                               <td class="col1">{{ _("Conflicts") }}</td>
-                               <td class="col2">{{ i }}</td>
-                       </tr>
-               {% end %}
-       </table>
-       <div style="clear: both;">&nbsp;</div>
-
-       <h2>{{ _("Build information") }}</h2>
-       <table class="form form2">
-               <tr>
-                       <td class="col1">{{ _("ID") }}</td>
-                       <td class="col2">
-                               <a href="/build/{{ file.build_id }}">{{ file.build_id }}</a>
-                       </td>
-               </tr>
-               <tr>
-                       <td class="col1">{{ _("Host") }}</td>
-                       <td class="col2">
-                               <a href="/builders/{{ file.build_host }}">{{ file.build_host }}</a>
-                       </td>
-               </tr>
-               <tr>
-                       <td class="col1">{{ _("Time") }}</td>
-                       <td class="col2">{{ file.build_date }}</td>
-               </tr>
-       </table>
-       <div style="clear: both;">&nbsp;</div>
-
-       <h3>{{ _("Files") }}</h3>
-       {% module PackageFilesTable(file.filelist) %}
-{% end block %}
-
-{% block sidebar %}
-       <h1>{{ _("Actions") }}</h1>
-       <ul>
-               <li><a href="{{ file.download }}">{{ _("Download file") }}</a></li>
-       </ul>
-{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 5090c469610db7d4b8ff206311e81c9aa8c2f127..067a55bea367c257b142a9cc1fec2eae80a142dd 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -127,9 +127,6 @@ class Application(tornado.web.Application):
                        (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)",
                                packages.FileViewHandler),
 
-                       # Files
-                       (r"/file/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", FileDetailHandler),
-
                        # Builds
                        (r"/builds", builds.IndexHandler),
                        (r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.ShowHandler),

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 8a18f321f9dfce46b7af2959bc49438298821c73..4ec826d86b7f342dfbf948583145e8122d172d0d 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -9,16 +9,6 @@ class IndexHandler(base.BaseHandler):
                self.render("index.html", jobs=self.backend.jobs.running)
 
 
-class FileDetailHandler(base.BaseHandler):
-       def get(self, uuid):
-               pkg, file = self.backend.packages.get_with_file_by_uuid(uuid)
-
-               if not file:
-                       raise tornado.web.HTTPError(404, "File not found")
-
-               self.render("file-detail.html", pkg=pkg, file=file)
-
-
 class LogHandler(base.BaseHandler):
        def get(self):
                kwargs = {