Changeset ec5ac22f1f4ce5c2a658d1690fd6ca44c732c643

Show
Ignore:
Timestamp:
02/03/08 10:28:52 (1 year ago)
Author:
William McBrine <wmcbrine@gmail.com>
git-committer:
William McBrine <wmcbrine@gmail.com> 1202056132 -0500
git-parent:

[d1133d570686ff1c270dd7750434c939c1578a9c], [ae0b9b35097c476bde6d089bce3c093b21e5b507]

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

Merge branch 'master' into subfolders-8.3

Conflicts:

plugins/video/video.py

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/video/video.py

    r1041a57 rec5ac22  
    1414CLASS_NAME = 'Video' 
    1515 
     16extfile = os.path.join(SCRIPTDIR, 'video.ext') 
     17try: 
     18    extensions = file(extfile).read().split() 
     19except: 
     20    extensions = None 
     21 
    1622debug = config.getDebug() 
    1723hack83 = config.getHack83() 
    …… 
    4147        if os.path.isdir(full_path): 
    4248            return True 
    43         return transcode.supported_format(full_path) 
     49        if extensions: 
     50            return os.path.splitext(full_path)[1].lower() in extensions 
     51        else: 
     52            return transcode.supported_format(full_path) 
    4453 
    4554    def hack(self, handler, query, subcname): 
    …… 
    204213            return 
    205214 
    206         tsn = handler.headers.getheader('tsn', '') 
     215        tsn = handler.headers.getheader('tsn', '') 
    207216 
    208217        o = urlparse("http://fake.host" + handler.path)