Changeset 3242

Show
Ignore:
Timestamp:
02/15/08 07:52:06 (8 months ago)
Author:
Blackhex
Message:
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • downloadsplugin/0.10/tracdownloads/api.py

    r3145 r3242  
    532532 
    533533                # Prepare file paths 
    534                 filepath = os.path.join(self.path, unicode(download['id']), 
    535                   download['file']) 
    536                 filepath = unicodedata.normalize('NFC', filepath) 
    537                 filepath = filepath.replace('\\', '/').replace(':', '/') 
    538                 path = os.path.dirname(filepath) 
     534                path = os.path.join(self.path, unicode(download['id'])) 
     535                filepath = os.path.join(path, download['file']) 
     536                path = os.path.normpath(path) 
     537                filepath = os.path.normpath(filepath) 
    539538                self.log.debug('filepath: %s' % ((filepath,))) 
    540539                self.log.debug('path: %s' % ((path,))) 
  • downloadsplugin/0.10/tracdownloads/core.py

    r2738 r3242  
    5656        if match: 
    5757            return True 
    58         match = re.match(r'''^/downloads/(\d+)$''', req.path_info) 
     58        match = re.match(r'''^/downloads/(\d+)($|/$)''', req.path_info) 
    5959        if match: 
    6060            req.args['action'] = 'get-file' 
  • downloadsplugin/0.11/tracdownloads/core.py

    r3114 r3242  
    5555        if match: 
    5656            return True 
    57         match = re.match(r'''^/downloads/(\d+)$''', req.path_info) 
     57        match = re.match(r'''^/downloads/(\d+)($|/$)''', req.path_info) 
    5858        if match: 
    5959            req.args['action'] = 'get-file' 
    6060            req.args['id'] = match.group(1) 
    6161            return True 
    62         match = re.match(r'''^/downloads/([^/]+)$''', req.path_info) 
     62        match = re.match(r'''^/downloads/([^/]+)($|/$)''', req.path_info) 
    6363        if match: 
    6464            req.args['action'] = 'get-file'