Changeset 2531

Timestamp:

07/27/07 15:27:44 (1 year ago)

Author:

Blackhex

Message:

DownloadsPlugin:

• Main UI implemented.
  
• [download:<id>] macro implemented.
  

NOTE: No Python traceback should appear from now altrought not all desired features are implemented. For those who had tried this plugin before: Clear all database entries of this plugin first before trying this revision.

Files:

• downloadsplugin/0.10/tracdownloads/api.py (modified) (15 diffs)
• downloadsplugin/0.10/tracdownloads/core.py (modified) (2 diffs)
• downloadsplugin/0.10/tracdownloads/db/db1.py (modified) (3 diffs)
• downloadsplugin/0.10/tracdownloads/htdocs/css/admin.css (modified) (1 diff)
• downloadsplugin/0.10/tracdownloads/htdocs/css/downloads.css (modified) (1 diff)
• downloadsplugin/0.10/tracdownloads/templates/admin-downloads-list.cs (modified) (4 diffs)
• downloadsplugin/0.10/tracdownloads/templates/downloads-list.cs (moved) (moved from downloadsplugin/0.10/tracdownloads/templates/downloads.cs) (2 diffs)
• downloadsplugin/0.10/tracdownloads/wiki.py (modified) (2 diffs)

downloadsplugin/0.10/tracdownloads/api.py

@@ -1 @@
-
+, mimetypes
-
-from trac.core import *
@@ -5 +5 @@
-from trac.wiki import wiki_to_html, wiki_to_oneliner
-from trac.util import format_datetime, pretty_timedelta, pretty_size
-
+, add_script
-
-class IDownloadChangeListener(Interface):
@@ -26 +26 @@
-class DownloadsApi(Component):
-
+    title = Option('downloads', 'title', 'Downloads',
+      'Main navigation bar button title.')
-    path = Option('downloads', 'path', '/var/lib/trac/downloads',
-      'Directory to store uploaded downloads.')
@@ -66 +68 @@
-
-    def get_downloads(self, req, cursor, order_by = 'id', desc = False):
-
-
-
+
+
+
+
-          " component, version, architecture, platform, type FROM download " \
-          "ORDER BY " + order_by + (" ASC", " DESC")[bool(desc)]
@@ -79 +82 @@
-            row['size'] = pretty_size(row['size'])
-            row['time'] = pretty_timedelta(row['time'])
+            row['count'] = row['count'] or 0
-            downloads.append(row)
-
@@ -135 +139 @@
-
-    def get_download(self, cursor, id):
-
-
-
+
+
+
+
-          " component, version, architecture, platform, type FROM download" \
-          " WHERE id = %s"
@@ -144 +149 @@
-        for row in cursor:
-            row = dict(zip(columns, row))
+            row['count'] = row['count'] or 0
-            return row
-
-    def get_download_by_time(self, cursor, time):
-
-
-
+
+
+
+
-          " component, version, architecture, platform, type FROM download" \
-          " WHERE time = %s"
@@ -156 +163 @@
-        for row in cursor:
-            row = dict(zip(columns, row))
+            row['count'] = row['count'] or 0
-            return row
-
@@ -184 +192 @@
-            row = dict(zip(columns, row))
-            return row
+
+    def get_description(self, req, cursor):
+        sql = "SELECT value FROM system WHERE name = 'downloads_description'"
+        self.log.debug(sql)
+        cursor.execute(sql)
+        for row in cursor:
+            return (row[0], wiki_to_html(row[0], self.env, req))
-
-    # Add item functions.
@@ -229 +244 @@
-        self._edit_item(cursor, 'download_type', id, type)
-
+    def edit_description(self, cursor, description):
+        sql = "UPDATE system SET value = %s WHERE name = 'downloads_description'"
+        self.log.debug(sql % (description,))
+        cursor.execute(sql, (description,))
+
-    # Delete item functions.
-
@@ -271 +291 @@
-        add_stylesheet(req, 'downloads/css/admin.css')
-
+        # Add JavaScripts
+        add_script(req, 'common/js/trac.js')
+        add_script(req, 'common/js/wikitoolbar.js')
+
-        # Fill up HDF structure and return template
-        req.hdf['download.authname'] = req.authname
-        req.hdf['downloads.href'] = req.href.admin('downloads', req.args.get(
-          'page'))
-        req.hdf['download.time'] = format_datetime(time.time())
-        return modes[-1] + '.cs', None
@@ -285 +307 @@
-        page = req.args.get('page')
-        action = req.args.get('action')
-mponen
+ntex
-          action))
+
+        if context == 'admin':
+            req.hdf['downloads.href'] = req.href.admin('downloads', page)
+        elif context == 'core':
+            req.hdf['downloads.href'] = req.href.downloads()
-
-        # Determine mode.
@@ -326 +353 @@
-                else:
-                    return ['admin-types-list']
+        elif context == 'core':
+            if action == 'get-file':
+                return ['get-file']
+            elif action == 'edit':
+                return ['description-edit', 'downloads-list']
+            elif action == 'post-edit':
+                return ['description-post-edit', 'downloads-list']
+            else:
+                return ['downloads-list']
-        else:
-            pass
@@ -331 +367 @@
-    def _do_action(self, req, cursor, modes):
-        for mode in modes:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            elif mode == 'admin-downloads-list':
@@ -359 +435 @@
-                  cursor)
-                req.hdf['downloads.types'] = self.get_types(req, cursor)
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-            elif mode == 'downloads-post-add':

downloadsplugin/0.10/tracdownloads/core.py

@@ -23 +23 @@
-    title = Option('downloads', 'title', 'Downloads',
-      'Main navigation bar button title.')
-    path = Option('downloads', 'path', '/var/lib/trac/downloads',
-      'Directory to store uploaded downloads.')
-
-    # IPermissionRequestor methods.
@@ -50 +48 @@
-    # IRequestHandler methods.
-    def match_request(self, req):
-
+
+
-            return True
-
-
-
+
+
+
+
-            return True
-        return False
-
-    def process_request(self, req):
-        # Create API object.
-        self.api = DownloadsApi(self.env)
-
-        # Get cursor.
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-
-CSS styles
-add_stylesheet(req, 'downloads/css/downloads.css')
+Prepare arguments and HDF structure.
+req.args['context'] = 'core'
-
-
-
-
-
-
-
-
-
+
+
+
-        db.commit()
-        return content
-
-    # Private functions.
-
-    def _get_modes(self, req):
-        action = req.args.get('action')
-        self.log.debug('action: %s' % (action,))
-        if action == 'get_file':
-            return ['get-file']
-        else:
-            return ['downloads-list']
-
-    def _do_actions(self, req, cursor, modes):
-        for mode in modes:
-            if mode == 'get-file':
-                req.perm.assert_permission('DOWNLOADS_VIEW')
-
-            elif mode == 'downloads-list':
-                req.perm.assert_permission('DOWNLOADS_VIEW')
-
-                # Get form values
-                order = req.args.get('order') or 'id'
-                desc = req.args.get('desc')
-
-                # Fill HDF structure
-                req.hdf['downloads.order'] = order
-                req.hdf['downloads.desc'] = desc
-                req.hdf['downloads.downloads'] = self.api.get_downloads(req,
-                  cursor)
-
-                return 'downloads.cs', None
-                #return mode + '.cs', None

downloadsplugin/0.10/tracdownloads/db/db1.py

@@ -10 +10 @@
-    Column('size', type = 'integer'),
-    Column('time', type = 'integer'),
+    Column('count', type = 'integer'),
-    Column('author'),
-    Column('tags'),
@@ -50 +51 @@
-  "INSERT INTO download_type (name) VALUES ('data')",
-  "INSERT INTO download_type (name) VALUES ('other')",
+  "INSERT INTO system (name, value) VALUES ('downloads_description', 'Here is a list of available downloads:')"
-]
-
@@ -64 +66 @@
-        cursor.execute(statement)
-
-
+.
-    cursor.execute("INSERT INTO system (name, value) VALUES"
-      " ('downloads_version', '1')")

downloadsplugin/0.10/tracdownloads/htdocs/css/admin.css

@@ -11 +11 @@
-}
-
-
-
-
+
+
+
+
-{
-  text-align: center;

downloadsplugin/0.10/tracdownloads/htdocs/css/downloads.css

@@ +1 @@
+div.downloads-list
+{
+  margin: 2em;
+}

downloadsplugin/0.10/tracdownloads/templates/admin-downloads-list.cs

@@ -128 +128 @@
-          <?cs call:sortable_th(downloads.order, downloads.desc, 'size', 'Size', downloads.href) ?>
-          <?cs call:sortable_th(downloads.order, downloads.desc, 'time', 'Uploaded', downloads.href) ?>
+          <?cs call:sortable_th(downloads.order, downloads.desc, 'count', 'Downloads', downloads.href) ?>
-          <?cs call:sortable_th(downloads.order, downloads.desc, 'author', 'Uploader', downloads.href) ?>
-          <?cs if:downloads.has_tags ?>
@@ -164 +165 @@
-            <td class="description">
-              <div class="description">
-
-
-
+
-              </div>
-            </td>
@@ -182 +181 @@
-                <a href="<?cs var:downloads.href ?>/<?cs var:download.id ?>?order=<?cs var:downloads.order ?>;desc=<?cs var:downloads.desc ?>">
-                  <?cs var:download.time ?>
+                </a>
+              </div>
+            </td>
+
+            <td class="count">
+              <div class="count">
+                <a href="<?cs var:downloads.href ?>/<?cs var:download.id ?>?order=<?cs var:downloads.order ?>;desc=<?cs var:downloads.desc ?>">
+                  <?cs var:download.count ?>
-                </a>
-              </div>
@@ -243 +250 @@
-              </div>
-            </td>
-
+
-        <?cs /each ?>
-      </tbody>

downloadsplugin/0.10/tracdownloads/templates/downloads-list.cs

@@ -1 +1 @@
-<?cs include "header.cs" ?>
-
-
+
-
-<div id="ctxtnav">
@@ -10 +9 @@
-    <h1><?cs var:downloads.title ?></h1>
-  </div>
+
+  <?cs var:downloads.description.1 ?>
+
+  <?cs if:trac.acl.DOWNLOADS_ADMIN ?>
+    <form method="post" action="<?cs var:downloads.href ?>">
+      <fieldset>
+        <legend>
+          Edit Description:
+        </legend>
+
+        <?cs if:args.action == 'edit' ?>
+          <div class="field">
+            <textarea id="description" name="description" class="wikitext" rows="10" cols="78"><?cs var:downloads.description.0 ?></textarea>
+          </div>
+        <?cs /if ?>
+
+        <div class="buttons">
+          <input type="submit" name="submit" value="Edit"/>
+          <?cs if:args.action == 'edit' ?>
+            <input type="button" name="cancel" value="Cancel" onclick="location.replace('<?cs var:downloads.href ?>?order=<?cs var:downloads.order ?>;desc=<?cs var:downloads.desc ?>')"/>
+            <input type="hidden" name="action" value="post-edit"/>
+          <?cs else ?>
+            <input type="hidden" name="action" value="edit"/>
+          <?cs /if ?>
+          <input type="hidden" name="order" value="<?cs var:downloads.order ?>"/>
+          <input type="hidden" name="desc" value="<?cs var:downloads.desc ?>"/>
+        </div>
+      </fieldset>
+    </form>
+  <?cs /if ?>
+
-  <?cs if:downloads.downloads.0.id ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          </tr>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <?cs else ?>
-    <p class="help">There are no downloads created.</p>

downloadsplugin/0.10/tracdownloads/wiki.py

@@ +1 @@
+
+from trac.core import *
+from trac.util.html import html
+
+from trac.wiki import IWikiSyntaxProvider
+
-from tracdownloads.api import *
-from trac.core import *
-from trac.wiki import IWikiSyntaxProvider
-from trac.util.html import html
-
-class DownloadsWiki(Component):
@@ -21 +24 @@
-    def _download_link(self, formatter, ns, params, label):
-        if ns == 'download':
-
-
-
+
+
+
+
-
-# Get referenced screensho
-api = DownloadsApi(self
+    # Get API componen
+    api = DownloadsApi(self.env
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+