Changeset 4364

Timestamp:

10/01/08 06:42:41 (3 months ago)

Author:

Blackhex

Message:

ScreenshotsPlugin:

• Zip archive upload support.
  
• Fixed bug that first screenshot was not displayed.
  

Files:

• screenshotsplugin/0.11/tracscreenshots/api.py (modified) (1 diff)
• screenshotsplugin/0.11/tracscreenshots/core.py (modified) (6 diffs)
• screenshotsplugin/0.11/tracscreenshots/matrix_view.py (modified) (2 diffs)

screenshotsplugin/0.11/tracscreenshots/api.py

@@ -100 +100 @@
-          components) and ' OR c.component IS NULL) ' or ') ') + 'ORDER BY ' + \
-            orders_str
-        self.log.debug(versions + components)
-        self.log.debug(sql % tuple(versions + components))
-        context.cursor.execute(sql, versions + components)

screenshotsplugin/0.11/tracscreenshots/core.py

@@ -3 +3 @@
-import sets, re, os, os.path, shutil, mimetypes, unicodedata, Image, ImageOps
-from datetime import *
+from zipfile import *
+from StringIO import *
-
-from trac.core import *
@@ -265 +267 @@
-                file, filename = self._get_file_from_req(context.req)
-                name, ext = os.path.splitext(filename)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                # Clear ID to prevent display of edit and delete button.
@@ -482 +434 @@
-                path = os.path.join(self.path, to_unicode(screenshot['id']))
-                path = os.path.normpath(path)
-
-                self.log.debug('path: %s' % (path,))
-
@@ -491 +442 @@
-                        os.remove(file)
-                    os.rmdir(path)
-
-
-
+
+
-
-                # Notify change listeners.
@@ -572 +522 @@
-                screenshots = api.get_filtered_screenshots(context,
-                  enabled_components, enabled_versions, relation, orders)
+                self.log.debug('screenshots: %s' % (screenshots,))
-
-                # Convert enabled components and versions to dictionary.
@@ -604 +555 @@
-                screenshot = api.get_screenshot(context, self.id)
-                self.log.debug('screenshot: %s' % (screenshot,))
+
+    def _add_screenshot(self, context, api, file, filename, time):
+        # Create image object.
+        image = Image.open(file)
+
+        # Construct screenshot dictionary from form values.
+        screenshot = {'name' :  context.req.args.get('name'),
+                      'description' : context.req.args.get('description'),
+                      'time' : time,
+                      'author' : context.req.authname,
+                      'tags' : context.req.args.get('tags'),
+                      'file' : filename,
+                      'width' : image.size[0],
+                      'height' : image.size[1],
+                      'priority' : int(context.req.args.get('priority')
+                        or '0')}
+
+        # Add new screenshot.
+        api.add_screenshot(context, screenshot)
+
+        # Get inserted screenshot to with new id.
+        screenshot = api.get_screenshot_by_time(context, screenshot['time'])
+
+        # Add components to screenshot.
+        components = context.req.args.get('components') or []
+        if not isinstance(components, list):
+            components = [components]
+        for component in components:
+            component = {'screenshot' : screenshot['id'],
+                         'component' : component}
+            api.add_component(context, component)
+        screenshot['components'] = components
+
+        # Add versions to screenshots
+        versions = context.req.args.get('versions') or []
+        if not isinstance(versions, list):
+            versions = [versions]
+        for version in versions:
+            version = {'screenshot' : screenshot['id'],
+                       'version' : version}
+            api.add_version(context, version)
+        screenshot['versions'] = versions
+
+        self.log.debug('screenshot: %s' % (screenshot,))
+
+        # Prepare file paths
+        name, ext = os.path.splitext(screenshot['file'])
+        path = os.path.join(self.path, unicode(screenshot['id']))
+        filepath = os.path.join(path, '%s-%ix%i%s' % (name, screenshot['width'],
+          screenshot['height'], ext))
+        path = os.path.normpath(path)
+        filepath = os.path.normpath(filepath)
+
+        self.log.debug('path: %s' % (path,))
+        self.log.debug('filename: %s' % (filepath,))
+
+        # Store uploaded image.
+        try:
+            os.mkdir(path)
+            out_file = open(filepath, 'wb+') 
+            file.seek(0)
+            shutil.copyfileobj(file, out_file)
+            out_file.close()
+        except Exception, error:
+            api.delete_screenshot(context, screenshot['id'])
+            try:
+                os.remove(filename)
+            except:
+                pass
+            try:
+                os.rmdir(path)
+            except:
+                pass
+            raise TracError('Error storing file. Is directory specified in path' \
+              ' config option in [screenshots] section of trac.ini existing?' \
+              ' Original message was: %s' % (to_unicode(error),))
+
+        # Notify change listeners.
+        for listener in self.change_listeners:
+            listener.screenshot_created(context.req, screenshot)
-
-    def _create_image(self, orig_name, path, name, ext, width, height):

screenshotsplugin/0.11/tracscreenshots/matrix_view.py

@@ -81 +81 @@
-        data['next_index'] = next_index
-        data['screenshot_count'] = len(data['screenshots'])
-
-        return ('screenshots-matrix-view.html', None)
-
@@ -99 +98 @@
-        for I in xrange(count):
-            # Add screenshot.
-
+=
-                row.append(screenshots[index + I])
-            else: