Changeset 21ec26f750eff397ee0cdca1ad4374cc6f3d95cb

Show
Ignore:
Timestamp:
01/22/08 07:21:23 (1 year ago)
Author:
William McBrine <wmcbrine@gmail.com>
git-committer:
William McBrine <wmcbrine@gmail.com> 1201008083 -0500
git-parent:

[778f2cfa64c8ee7827d9effbba9720d9609c039b], [26f47cd441beeadb2ffc9a6ab7091595de431a0a]

git-author:
William McBrine <wmcbrine@gmail.com> 1201008083 -0500
Message:

Merge branch 'master' into subfolders-8.3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • httpserver.py

    r1d1efb4 r21ec26f  
    2929 
    3030    def add_container(self, name, settings): 
    31         if self.containers.has_key(name) or name == 'TivoConnect': 
     31        if self.containers.has_key(name) or name == 'TiVoConnect': 
    3232            raise "Container Name in use" 
    3333        settings['content_type'] = GetPlugin(settings['type']).CONTENT_TYPE 
    …… 
    4141 
    4242    def do_GET(self): 
     43 
     44        basepath = unquote_plus(self.path).split('/')[1] 
    4345  
    4446        ## Get File 
    4547        for name, container in self.server.containers.items(): 
    46             #XXX make a regex 
    47             path = unquote_plus(self.path) 
    48             if path.startswith('/' + name): 
     48            if basepath == name: 
    4949                plugin = GetPlugin(container['type']) 
    5050                plugin.send_file(self, container, name)