Changeset 4314

Timestamp:

09/22/08 04:48:38 (2 months ago)

Author:

Blackhex

Message:

ScreenshotsPlugin:

• Replacement of screenshot image is now possible.
  
• Request for missing screenshot with SCREENSHOTS_ADMIN permission returns add screenshot form.
  

Files:

• screenshotsplugin/0.11/tracscreenshots/api.py (modified) (1 diff)
• screenshotsplugin/0.11/tracscreenshots/core.py (modified) (10 diffs)
• screenshotsplugin/0.11/tracscreenshots/templates/screenshot-add.html (modified) (1 diff)

screenshotsplugin/0.11/tracscreenshots/api.py

@@ -244 +244 @@
-        self._edit_item(context, 'screenshot', id, tmp_screenshot)
-
-
-    # Delete item functions
-

screenshotsplugin/0.11/tracscreenshots/core.py

@@ -179 +179 @@
-                screenshot = api.get_screenshot(context, screenshot_id)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                    else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            elif action == 'add':
@@ -247 +253 @@
-                name, ext = os.path.splitext(filename)
-                filename = name + ext.lower()
-
-                # Check correct file type.
-                reg = re.compile(r'^(.*)[.](.*)$')
-                result = reg.match(filename)
-                if result:
-                    if not result.group(2).lower() in self.ext:
-                        raise TracError('Unsupported uploaded file type.')
-                else:
-                    raise TracError('Unsupported uploaded file type.')
-
-                # Create image object.
@@ -300 +297 @@
-
-                # Prepare file paths
+                name, ext = os.path.splitext(screenshot['file'])
-                path = os.path.join(self.path, unicode(screenshot['id']))
-.%s' % (result.group(1)
-result.group(2)
+%s' % (name
+ext
-                path = os.path.normpath(path)
-                filepath = os.path.normpath(filepath)
+
-                self.log.debug('path: %s' % (path,))
-                self.log.debug('filename: %s' % (filepath,))
@@ -317 +316 @@
-                except Exception, error:
-                    api.delete_screenshot(context, screenshot['id'])
-                    try:
-                       self.log.debug(error)
-                    except:
-                       pass
-                    try:
-                        os.remove(filename)
@@ -366 +361 @@
-                      'Screenshot not found.')
-
+                # Get image file from request.
+                image = context.req.args['image']
+                if hasattr(image, 'filename') and image.filename:
+                    in_file, filename = self._get_file_from_req(context.req)
+                    name, ext = os.path.splitext(filename)
+                    filename = name + ext.lower()
+                else:
+                    filename = None
+
-                # Construct screenshot dictionary from form values.
-                screenshot = {'name' :  context.req.args.get('name'),
@@ -374 +378 @@
-                              'components' : context.req.args.get(
-                                'components') or [],
-
+
+
+
+
+
+
+
+
+
-
-                # Convert components and versions to list if only one item is
@@ -383 +395 @@
-                     screenshot['versions'] = [screenshot['versions']]
-
+                self.log.debug(screenshot)
+
-                # Edit screenshot.
-                api.edit_screenshot(context, screenshot_id, screenshot)
-
+                # Prepare file paths.
+                if filename:
+                    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('filepath: %s' % (filepath,))
+
+                    # Delete present images.
+                    try:
+                        for file in os.listdir(path):
+                            file = os.path.join(path, file)
+                            file = os.path.normpath(file)
+                            os.remove(file)
+                    except Exception, error:
+                        raise TracError('Error deleting screenshot. Original' \
+                          ' message was: %s' % (error,))
+
+                    # Store uploaded image.
+                    try:
+                        out_file = open(filepath, 'wb+') 
+                        in_file.seek(0)
+                        shutil.copyfileobj(in_file, out_file)
+                        out_file.close()
+                    except Exception, error:
+                        try:
+                            os.remove(filename)
+                        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' \
+                          % (error,))
-
-                # Notify change listeners.
@@ -392 +443 @@
-                      old_screenshot)
-
-id
+ID
-                context.req.args['id'] = None
-
@@ -408 +459 @@
-                    raise TracError('Deleted screenshot not found.',
-                      'Screenshot not found.')
+
+                # Delete screenshot.
+                api.delete_screenshot(context, screenshot['id'])
+
+                #Â Delete screenshot files. Don't append any other files there :-).
+                path = os.path.join(self.path, to_unicode(screenshot['id']))
+                path = os.path.normpath(path)
+
+                self.log.debug('path: %s' % (path,))
+
-                try:
-                    # Delete screenshot.
-                    api.delete_screenshot(context, screenshot['id'])
-
-                    #Â Delete screenshot files. Don't append any other files there :-).
-                    path = os.path.join(self.path, to_unicode(screenshot['id']))
-                    path = os.path.normpath(path)
-                    self.log.debug('path: %s' % (path,))
-                    for file in os.listdir(path):
-                        file = os.path.join(path, file)
@@ -527 +581 @@
-            raise TracError('Can\'t upload empty file.')
-        filename = os.path.basename(image.filename).decode('utf-8')
-
+
+
+
+
+
+
+
+
+
+
-        return image.file, filename
-

screenshotsplugin/0.11/tracscreenshots/templates/screenshot-add.html

@@ -25 +25 @@
-            <input type="text" id="description" name="description" value="${(req.args.action == 'edit') and screenshots.screenshot.description or ''}"/><br/>
-          </div>
-py:if="req.args.action == 'add'" 
+
-            <label for="image">Image File:</label><br/>
-            <input type="file" id="image" name="image" value=""/><br/>