Add changelog of packages.

diff --git a/backend/builds.py b/backend/builds.py
index be6940d8c899c5be15ae058268001ab0bde04162..a9f4e40753d0ed56eb429cde2e7a30d75523f6c0 100644 (file)
--- a/backend/builds.py
+++ b/backend/builds.py
@@ -233,6 +233,41 @@ class Builds(base.Object):
 
                return builds
 
+       def get_changelog(self, name, public=None, limit=5, offset=0):
+               query = "SELECT builds.* FROM builds \
+                       JOIN packages ON builds.pkg_id = packages.id \
+                       WHERE \
+                               builds.type = %s \
+                       AND \
+                               packages.name = %s"
+               args = ["release", name,]
+
+               if public == True:
+                       query += " AND builds.public = %s"
+                       args.append("Y")
+               elif public == False:
+                       query += " AND builds.public = %s"
+                       args.append("N")
+
+               query += " ORDER BY builds.time_created DESC"
+
+               if limit:
+                       if offset:
+                               query += " LIMIT %s,%s"
+                               args += [offset, limit]
+                       else:
+                               query += " LIMIT %s"
+                               args.append(limit)
+
+               builds = []
+               for b in self.db.query(query, *args):
+                       b = Build(self.pakfire, b.id, b)
+                       builds.append(b)
+
+               builds.sort(reverse=True)
+
+               return builds
+
 
 class Build(base.Object):
        def __init__(self, pakfire, id, data=None):

diff --git a/backend/sources.py b/backend/sources.py
index c6de5d3602ecdaee003f71586bbc0dd34fc5b94e..d6ecbe3150411da2db8df74b16d8ca0a453f935c 100644 (file)
--- a/backend/sources.py
+++ b/backend/sources.py
@@ -137,6 +137,12 @@ class Commit(base.Object):
        def message(self):
                return self.data.body.strip()
 
+       @property
+       def message_full(self):
+               msg = [self.subject, ""] + self.message.splitlines()
+
+               return "\n".join(msg)
+
        @property
        def date(self):
                return self.data.date

diff --git a/data/templates/modules/changelog/entry.html b/data/templates/modules/changelog/entry.html
new file mode 100644 (file)
index 0000000..79af733
--- /dev/null
+++ b/data/templates/modules/changelog/entry.html
@@ -0,0 +1,35 @@
+<li class="media">
+       <div class="media-body">
+               <h4>
+                       <a href="/build/{{ build.uuid }}">{{ build.name }}</a>
+
+                       <small>
+                               {{ locale.format_date(build.created) }}
+
+                               {% if build.repo %}
+                                       {% if build.repo.type == "stable" %}
+                                               <span class="text-success pull-right">{{ _("Stable") }}</span>
+                                       {% elif build.repo.type == "unstable" %}
+                                               <span class="text-warning pull-right">{{ _("Unstable") }}</span>
+                                       {% elif build.repo.type == "testing" %}
+                                               <span class="text-error pull-right">{{ _("Testing") }}</span>
+                                       {% end %}
+                               {% end %}
+                       </small>
+               </h4>
+
+               {% if build.commit %}
+                       {% module Text(build.commit.message_full) %}
+
+                       <p class="muted pull-right">
+                               {{ _("Author") }} {% module Maintainer(build.commit.author) %}
+                               &dash;
+                               {{ _("Commit") }} <a href="/distro/{{ build.distro.identifier }}/source/{{ build.pkg.commit.source.identifier }}/{{ build.pkg.commit.revision }}">{{ build.pkg.commit.revision[:7] }}</a>
+                       </p>
+               {% else %}
+                       <p class="muted">
+                               {{ _("No commit message.") }}
+                       </p>
+               {% end %}
+       </div>
+</li>

diff --git a/data/templates/modules/changelog/index.html b/data/templates/modules/changelog/index.html
new file mode 100644 (file)
index 0000000..44f0b19
--- /dev/null
+++ b/data/templates/modules/changelog/index.html
@@ -0,0 +1,5 @@
+<ul class="media-list">
+       {% for b in builds %}
+               {% module ChangelogEntry(b) %}
+       {% end %}
+</ul>

diff --git a/data/templates/package-detail-list.html b/data/templates/package-detail-list.html
index 1704f666ed871a0173d87d9179a6cb7b4af06837..4d9893307b7edf3990d2f89905df30b80e85f4fd 100644 (file)
--- a/data/templates/package-detail-list.html
+++ b/data/templates/package-detail-list.html
@@ -72,37 +72,46 @@
                </div>
        </div>
 
-       <div class="row">
-               <div class="span12">
-                       <hr />
-               </div>
-       </div>
+       <hr>
 
        <div class="row">
                <div class="span8">
+                       <h3>{{ _("Changelog") }}</h3>
+
+                       {% module Changelog(name=name, limit=5) %}
+
+                       <hr>
+                       <p class="ac">
+                               <a href="/package/{{ name }}/changelog">{{ _("Full changelog") }}</a>
+                       </p>
+               </div>
+
+               <div class="span4">
                        <h3>{{ _("Open bugs") }}</h3>
                        {% if bugs %}
                                {% module BugsTable(pkg, bugs) %}
                        {% else %}
                                <blockquote>
-                                       {{ _("There are currently no open bugs for <em>%s</em>.") % pkg.name }}
+                                       {{ _("There are currently no open bugs for %s.") % pkg.name }}
                                </blockquote>
                        {% end %}
 
-                       <div class="btn-toolbar pull-right">
-                               <div class="btn-group">
-                                       <a class="btn" href="{{ bugtracker.enter_url(pkg.name) }}" target="_blank">
-                                               {{ _("File a new bug") }}
-                                       </a>
-                                       <a class="btn" href="{{ bugtracker.buglist_url(pkg.name) }}" target="_blank">
-                                               {{ _("Show all bugs") }}
-                                       </a>
+                       <div class="ac">
+                               <div class="btn-toolbar">
+                                       <div class="btn-group">
+                                               <a class="btn" href="{{ bugtracker.enter_url(pkg.name) }}" target="_blank">
+                                                       {{ _("File new bug") }}
+                                               </a>
+                                               <a class="btn" href="{{ bugtracker.buglist_url(pkg.name) }}" target="_blank">
+                                                       {{ _("Show all bugs") }}
+                                               </a>
+                                       </div>
                                </div>
                        </div>
-               </div>
 
-               <div class="span4">
                        {% if build_times %}
+                               <hr>
+
                                <h3>{{ _("Build times") }}</h3>
 
                                <table class="table table-striped table-hover">

diff --git a/data/templates/packages/changelog.html b/data/templates/packages/changelog.html
new file mode 100644 (file)
index 0000000..9929ce7
--- /dev/null
+++ b/data/templates/packages/changelog.html
@@ -0,0 +1,53 @@
+{% extends "../base.html" %}
+
+{% block title %}{{ _("Changelog of %s") % name }}{% end block %}
+
+{% block body %}
+       <ul class="breadcrumb">
+               <li>
+                       <a href="/">{{ _("Home") }}</a>
+                       <span class="divider">/</span>
+               </li>
+               <li>
+                       <a href="/packages">{{ _("Packages") }}</a>
+                       <span class="divider">/</span>
+               </li>
+               <li>
+                       <a href="/package/{{ name }}">{{ name }}</a>
+                       <span class="divider">/</span>
+               </li>
+               <li class="active">
+                       <a href="/package/{{ name }}/changelog">{{ _("Changelog") }}</a>
+               </li>
+       </ul>
+
+       <div class="page-header">
+               <h2>
+                       {{ name }} <small>{{ _("Changelog") }}</small>
+               </h2>
+       </div>
+
+       {% module Changelog(builds=builds) %}
+
+       <ul class="pager">
+               {% if have_prev %}
+                       <li class="previous">
+                               <a href="?offset={{ offset - limit }}&limit={{ limit }}">&larr; {{ _("Older") }}</a>
+                       </li>
+               {% else %}
+                       <li class="previous disabled">
+                               <a href="#">&larr; {{ _("Older") }}</a>
+                       </li>
+               {% end %}
+
+               {% if have_next %}
+                       <li class="next">
+                               <a href="?offset={{ offset + limit }}&limit={{ limit }}">{{ _("Newer") }} &rarr;</a>
+                       </li>
+               {% else %}
+                       <li class="next disabled">
+                               <a href="#">{{ _("Newer") }} &rarr;</a>
+                       </li>
+               {% end %}
+       </ul>
+{% end block %}

diff --git a/web/__init__.py b/web/__init__.py
index 4061b828491a2709fa174fe03834d47f7727d5da..cefa3e3a069a5e089caaf21e204297b185c726c9 100644 (file)
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -42,6 +42,11 @@ class Application(tornado.web.Application):
                                "BuildLog"           : BuildLogModule,
                                "BuildOffset"        : BuildOffsetModule,
                                "BuildTable"         : BuildTableModule,
+
+                               # Changelog
+                               "Changelog"          : ChangelogModule,
+                               "ChangelogEntry"     : ChangelogEntryModule,
+
                                "CommitsTable"       : CommitsTableModule,
                                "JobsTable"          : JobsTableModule,
                                "JobsList"           : JobsListModule,
@@ -107,6 +112,7 @@ class Application(tornado.web.Application):
                        (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", PackageDetailHandler),
                        (r"/package/([\w\-\+]+)/properties", PackagePropertiesHandler),
                        (r"/package/([\w\-\+]+)", PackageNameHandler),
+                       (r"/package/([\w\-\+]+)/changelog", PackageChangelogHandler),
 
                        # Files
                        (r"/file/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", FileDetailHandler),

diff --git a/web/handlers_packages.py b/web/handlers_packages.py
index 857647c9e8210201a3432957a333f8e852f0cc37..ee23b2bc2869a67df1c797c1ef9bb69fc49dc07d 100644 (file)
--- a/web/handlers_packages.py
+++ b/web/handlers_packages.py
@@ -87,11 +87,46 @@ class PackageNameHandler(BaseHandler):
                        "scratch_builds" : builds["scratch"],
                }
 
-               self.render("package-detail-list.html", builds=builds,
+               self.render("package-detail-list.html", builds=builds, name=name,
                        latest_build=latest_build, pkg=latest_build.pkg,
                        build_times=build_times, bugs=bugs, **kwargs)
 
 
+class PackageChangelogHandler(BaseHandler):
+       def get(self, name):
+               limit = self.get_argument("limit", 10)
+               try:
+                       limit = int(limit)
+               except ValueError:
+                       limit = 10
+
+               offset = self.get_argument("offset", 0)
+               try:
+                       offset = int(offset)
+               except ValueError:
+                       offset = 0
+
+               # Get one more build than requested to find out if there are more items
+               # to display (next button).
+               builds = self.pakfire.builds.get_changelog(name, limit=limit + 1, offset=offset)
+
+               if len(builds) >= limit:
+                       have_next = True
+               else:
+                       have_next = False
+
+               if offset < limit:
+                       have_prev = False
+               else:
+                       have_prev = True
+
+               # Clip list to limit.
+               builds = builds[:limit]
+
+               self.render("packages/changelog.html", name=name, builds=builds,
+                       limit=limit, offset=offset, have_prev=have_prev, have_next=have_next)
+
+
 class PackageDetailHandler(BaseHandler):
        def get(self, uuid):
                pkg = self.pakfire.packages.get_by_uuid(uuid)

diff --git a/web/ui_modules.py b/web/ui_modules.py
index 2399ba02f5074bb4ba594f8f5296f52e93716039..98a3358e3a7d117a501e072bf2bdcd0ccf3216a3 100644 (file)
--- a/web/ui_modules.py
+++ b/web/ui_modules.py
@@ -81,6 +81,19 @@ class BugsTableModule(UIModule):
                        pkg=pkg, bugs=bugs)
 
 
+class ChangelogModule(UIModule):
+       def render(self, name=None, builds=None, *args, **kwargs):
+               if not builds:
+                       builds = self.pakfire.builds.get_changelog(name, *args, **kwargs)
+
+               return self.render_string("modules/changelog/index.html", builds=builds)
+
+
+class ChangelogEntryModule(UIModule):
+       def render(self, build):
+               return self.render_string("modules/changelog/entry.html", build=build)
+
+
 class CommitsTableModule(UIModule):
        def render(self, distro, source, commits, full_format=True):
                return self.render_string("modules/commits-table.html",