Changeset 3128

Timestamp:

01/22/08 14:05:18 (10 months ago)

Author:

peca

Message:

Some bug fixes according to Brett from ticket #2455 (thanks!) - in saving data into sessions and serving file to download (changed to req.send_file()) in Trac 0.11 version.

Files:

• tracdownloaderplugin/0.10/tracdownloader/model.py (modified) (2 diffs)
• tracdownloaderplugin/0.11/tracdownloader/model.py (modified) (6 diffs)
• tracdownloaderplugin/0.11/tracdownloader/web_ui.py (modified) (4 diffs)
• tracdownloaderplugin/0.9/tracdownloader/model.py (modified) (2 diffs)

tracdownloaderplugin/0.10/tracdownloader/model.py

@@ -1008 +1008 @@
-            
-        for item in label_list:
+            if (item[0] not in self.attr):
+                 continue
-            if strip(self.attr[item[0]]) != '':
-                items.append([item[1], self.attr[item[0]]])
@@ -1078 +1080 @@
-            elif item['type'] == 'text':
-                req.session[prefix + item['name']] = item['value']
+        req.session.save()
-            
-    def load_from_session(self):

tracdownloaderplugin/0.11/tracdownloader/model.py

@@ -636 +636 @@
-        """Find, open, find mime type and serve file to user."""
-        
+        """ Old way for serving file to user.
-        try:
-            file_obj = file(self.file, "rb")
-        except IOError:
-            raise TracError, 'Sorry. Error reading the file ' + self.file + '.'
-
+"""
-        mime = MimeTypes(self.env).dict
-        mime_type = 'application/octet-stream'
@@ -651 +652 @@
-                mime_type = mime[ext]
-        
+        """ Old way for serving file to user.
-        req.send_response(200)
-        req.send_header('Content-Type', mime_type)
-        req.end_headers()
-
+
-        # Serve file kilobyte by kilobyte
-        while True:
@@ -663 +665 @@
-            
-        file_obj.close()
+        """
+        # Serve file to user
+        req.send_file(self.file, mime_type)
-    
-    def delete(self):
@@ -786 +791 @@
-        id = self.db.get_last_id(cursor, 'downloader_downloaded')
-        self.db.commit()
+        
+        self.env.log.warning("Inserted: %d" % id)
-        
-        for item in self.schema:
@@ -1008 +1015 @@
-            
-        for item in label_list:
+            if (item[0] not in self.attr):
+                 continue
-            if strip(self.attr[item[0]]) != '':
-                items.append([item[1], self.attr[item[0]]])
@@ -1078 +1087 @@
-            elif item['type'] == 'text':
-                req.session[prefix + item['name']] = item['value']
+        req.session.save()
-            
-    def load_from_session(self):

tracdownloaderplugin/0.11/tracdownloader/web_ui.py

@@ -446 +446 @@
-        if not req.session.get('downloader_files'):
-            req.session['downloader_files'] = ''
+            req.session.save()
-        #self.env.log.info("Files: " + req.session.get('downloader_files'))
-        
@@ -484 +485 @@
-            # Test if session works
-            req.session['downloader_test'] = 'test'
+            req.session.save()
-        
-        render_downloads_table(self.env, req, filter=filter, f_id=f_id)
@@ -560 +562 @@
-        """
-        Serve to hdf set variables for final download link.
-r
+d
-        """
-        # Cannot serve link to people without session
@@ -597 +599 @@
-                return True
-        
-file number is input
+the file number is in
-        files = split(files, ',')
-        if str(id) in files:

tracdownloaderplugin/0.9/tracdownloader/model.py

@@ -1008 +1008 @@
-            
-        for item in label_list:
+            if (item[0] not in self.attr):
+                 continue
-            if strip(self.attr[item[0]]) != '':
-                items.append([item[1], self.attr[item[0]]])
@@ -1078 +1080 @@
-            elif item['type'] == 'text':
-                req.session[prefix + item['name']] = item['value']
+        req.session.save()
-            
-    def load_from_session(self):