Changeset 48e5447199435cb9695489516056d65842b74acc

Timestamp:

03/01/08 17:37:53 (10 months ago)

Author:

KRKeegan <-NOSPAM-kevin@krkeegan.com>

git-committer:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1204414673 -0800

git-parent:

[f1e76d8061669097cf6aae05d118690c87853181], [13846522caa6199e6c12e614475b80438432e08d]

git-author:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1204414673 -0800

Message:

Merge branch 'master' of git://repo.or.cz/pyTivo/wgw

Conflicts:

plugins/video/transcode.py
plugins/video/video.py

Files:

• debug.py (added)
• httpserver.py (modified) (2 diffs)
• plugins/video/transcode.py (modified) (23 diffs)
• plugins/video/video.py (modified) (15 diffs)
• pyTivo.py (modified) (2 diffs)

httpserver.py

@@ -7 +7 @@
-import config
-from xml.sax.saxutils import escape
+from debug import debug_write, fn_attr
-
-SCRIPTDIR = os.path.dirname(__file__)
-
-debug = config.getDebug()
-hack83 = config.getHack83()
-
-def debug_write(data):
-    if debug:
-        debug_out = []
-        debug_out.append('httpserver.py - ')
-        for x in data:
-            debug_out.append(str(x))
-        fdebug = open('debug.txt', 'a')
-        fdebug.write(' '.join(debug_out))
-        fdebug.close()
-
-class TivoHTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
@@ -134 +124 @@
-    def unsupported(self, query):
-        if hack83 and 'Command' in query and 'Filter' in query:
-
-\n
+__name__, fn_attr(), 
+
-            command = query['Command'][0]
-            plugin = GetPlugin('video')
-            if ''.join(query['Filter']).find('video') >= 0 and \
-               hasattr(plugin, command):
-
+__name__, fn_attr(), 
-                             'yup it is video',
-\n
+
-                method = getattr(plugin, command)
-                method(self, query)

plugins/video/transcode.py

@@ -1 +1 @@
-import subprocess, shutil, os, re, sys, ConfigParser, time, lrucache
-import config
+from debug import debug_write, fn_attr
-
-info_cache = lrucache.LRUCache(1000)
+videotest = os.path.join(os.path.dirname(__file__), 'videotest.mpg')
-
-def ffmpeg_path():
-    return config.get('Server', 'ffmpeg')
-
-videotest = os.path.join(os.path.dirname(__file__), 'videotest.mpg')
-
-def debug_write(data):
-    if config.getDebug():
-        debug_out = []
-        for x in data:
-            debug_out.append(str(x))
-        fdebug = open('debug.txt', 'a')
-        fdebug.write(' '.join(debug_out))
-        fdebug.close()
-
-# XXX BIG HACK
@@ -34 +25 @@
-def output_video(inFile, outFile, tsn=''):
-    if tivo_compatable(inFile, tsn):
-['output_video: ', inFile, ' is tivo compatible\n
+__name__, fn_attr(), [inFile, ' is tivo compatible
-        f = file(inFile, 'rb')
-        shutil.copyfileobj(f, outFile)
-        f.close() 
-    else:
-['output_video: ', inFile, ' is not tivo compatible\n
+__name__, fn_attr(), [inFile, ' is not tivo compatible
-        transcode(inFile, outFile, tsn)
-
@@ -56 +47 @@
-
-    cmd = [ffmpeg_path(), '-i', inFile] + cmd_string.split()
+    print 'transcoding to tivo model '+tsn[:3]+' using ffmpeg command:'
-    print cmd
-['transcode: ffmpeg command is ', ' '.join(cmd), '\n'
+__name__, fn_attr(), ['ffmpeg command is ', ' '.join(cmd)
-    ffmpeg = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    try:
@@ -99 +91 @@
-    type, width, height, fps, millisecs, kbps, akbps, acodec, afreq =  video_info(inFile)
-
-['tsn:', tsn, '\n'
+__name__, fn_attr(), ['tsn:', tsn
-
-    aspect169 = config.get169Setting(tsn)
-
-['aspect169:', aspect169, '\n'
+__name__, fn_attr(), ['aspect169:', aspect169
-
-    optres = config.getOptres()
-
-['optres:', optres, '\n'
+__name__, fn_attr(), ['optres:', optres
-
-    if optres:
@@ -121 +113 @@
-    rheight, rwidth = height/d, width/d
-
-['select_aspect: File=', inFile, ' Type=', type, ' width=', width, ' height=', height, ' fps=', fps, ' millisecs=', millisecs, ' ratio=', ratio, ' rheight=', rheight, ' rwidth=', rwidth, ' TIVO_HEIGHT=', TIVO_HEIGHT, 'TIVO_WIDTH=', TIVO_WIDTH, '\n'
+__name__, fn_attr(), ['File=', inFile, ' Type=', type, ' width=', width, ' height=', height, ' fps=', fps, ' millisecs=', millisecs, ' ratio=', ratio, ' rheight=', rheight, ' rwidth=', rwidth, ' TIVO_HEIGHT=', TIVO_HEIGHT, 'TIVO_WIDTH=', TIVO_WIDTH
-
-    multiplier16by9 = (16.0 * TIVO_HEIGHT) / (9.0 * TIVO_WIDTH)
@@ -130 +122 @@
-                # else, optres is enabled and resizes SD video to the "S2" standard on S3/HD.
-    elif (rwidth, rheight) in [(4, 3), (10, 11), (15, 11), (59, 54), (59, 72), (59, 36), (59, 54)]:
-['select_aspect: File is within 4:3 list.\n
+__name__, fn_attr(), ['File is within 4:3 list.
-        return ['-aspect', '4:3', '-s', str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT)]
-    elif ((rwidth, rheight) in [(16, 9), (20, 11), (40, 33), (118, 81), (59, 27)]) and aspect169:
-['select_aspect: File is within 16:9 list and 16:9 allowed.\n
+__name__, fn_attr(), ['File is within 16:9 list and 16:9 allowed.
-        return ['-aspect', '16:9', '-s', str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT)]
-    else:
@@ -162 +154 @@
-                        settings.append('-s')
-                        settings.append(str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT))
-['select_aspect: 16:9 aspect allowed, file is wider than 16:9 padding top and bottom\n', ' '.join(settings), '\n'
+__name__, fn_attr(), ['16:9 aspect allowed, file is wider than 16:9 padding top and bottom', ' '.join(settings)
-                else: #too skinny needs padding on left and right.
-                    endWidth = int((TIVO_HEIGHT*width)/(height*multiplier16by9))
@@ -185 +177 @@
-                        settings.append('-s')
-                        settings.append(str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT))
-['select_aspect: 16:9 aspect allowed, file is narrower than 16:9 padding left and right\n', ' '.join(settings), '\n'
+__name__, fn_attr(), ['16:9 aspect allowed, file is narrower than 16:9 padding left and right\n', ' '.join(settings)
-            else: #this is a 4:3 file or 16:9 output not allowed
-                settings.append('-aspect')
@@ -208 +200 @@
-                    settings.append('-s')
-                    settings.append(str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT))
-['select_aspect: File is wider than 4:3 padding top and bottom\n', ' '.join(settings), '\n'
+__name__, fn_attr(), ['File is wider than 4:3 padding top and bottom\n', ' '.join(settings)
-
-            return settings
@@ -236 +228 @@
-                settings.append(str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT))
-
-['select_aspect: File is taller than 4:3 padding left and right\n', ' '.join(settings), '\n'
+__name__, fn_attr(), ['File is taller than 4:3 padding left and right\n', ' '.join(settings)
-            
-            return settings
@@ -246 +238 @@
-
-    if (inFile[-5:]).lower() == '.tivo':
-['tivo_compatible: ', inFile, ' ends with .tivo\n'
+__name__, fn_attr(), ['TRUE, ends with .tivo.', inFile
-        return True
-
-    if not type == 'mpeg2video':
-        #print 'Not Tivo Codec'
-['tivo_compatible: ', inFile, ' is not mpeg2video it is ', type, '\n'
+__name__, fn_attr(), ['FALSE, type', type, 'not mpeg2video.', inFile
-        return False
-
-    if (inFile[-3:]).lower() == '.ts':
-['tivo_compatible: ', inFile, ' transport stream not supported ', '\n'
+__name__, fn_attr(), ['FALSE, transport stream not supported.', inFile
-        return False
-
-    if not akbps or int(akbps) > config.getMaxAudioBR(tsn):
-['tivo_compatible: ', inFile, ' max audio bitrate exceeded it is ', akbps, '\n'
+__name__, fn_attr(), ['FALSE,', akbps, 'kbps exceeds max audio bitrate.', inFile
-        return False
-
-    if not kbps or int(kbps)-int(akbps) > config.strtod(config.getMaxVideoBR())/1000:
-['tivo_compatible: ', inFile, ' max video bitrate exceeded it is ', kbps, '\n'
+__name__, fn_attr(), ['FALSE,', kbps, 'kbps exceeds max video bitrate.', inFile
-        return False
-
-    if config.isHDtivo(tsn):
-['tivo_compatible: ', inFile, ' you have a S3 skiping the rest of the tests', '\n'
+__name__, fn_attr(), ['TRUE, HD Tivo detected, skipping remaining tests', inFile
-        return True
-
-    if not fps == '29.97':
-        #print 'Not Tivo fps'
-['tivo_compatible: ', inFile, ' is not correct fps it is ', fps, '\n'
+__name__, fn_attr(), ['FALSE,', fps, 'fps, should be 29.97.', inFile
-        return False
-
@@ -278 +270 @@
-        if (mode[0], mode[1]) == (width, height):
-            #print 'Is TiVo!'
-['tivo_compatible: ', inFile, ' has correct width of ', width, ' and height of ', height, '\n'
+__name__, fn_attr(), ['TRUE,', width, 'x', height, 'is valid.', inFile
-            return True
-        #print 'Not Tivo dimensions'
@@ -287 +279 @@
-    if inFile != videotest:
-        if inFile in info_cache and info_cache[inFile][0] == mtime:
-['video_info: ', inFile, ' cache hit!', '\n'
+__name__, fn_attr(), ['CACHE HIT!', inFile
-            return info_cache[inFile][1]
-
-    if (inFile[-5:]).lower() == '.tivo':
-        info_cache[inFile] = (mtime, (True, True, True, True, True, True, True, True, True))
-['video_info: ', inFile, ' ends in .tivo.\n'
+__name__, fn_attr(), ['VALID, ends in .tivo.', inFile
-        return True, True, True, True, True, True, True, True, True
-
@@ -310 +302 @@
-
-    output = ffmpeg.stderr.read()
-['video_info: ffmpeg output=', output, '\n'
+__name__, fn_attr(), ['ffmpeg output=', output
-
-    rezre = re.compile(r'.*Video: ([^,]+),.*')
@@ -318 +310 @@
-    else:
-        info_cache[inFile] = (mtime, (None, None, None, None, None, None, None, None, None))
-['video_info: failed at codec\n
+__name__, fn_attr(), ['failed at video codec
-        return None, None, None, None, None, None, None, None, None
-
@@ -328 +320 @@
-    else:
-        info_cache[inFile] = (mtime, (None, None, None, None, None, None, None, None, None))
-['video_info: failed at width/height\n
+__name__, fn_attr(), ['failed at width/height
-        return None, None, None, None, None, None, None, None, None
-
@@ -337 +329 @@
-    else:
-        info_cache[inFile] = (mtime, (None, None, None, None, None, None, None, None, None))
-['video_info: failed at fps\n
+__name__, fn_attr(), ['failed at fps
-        return None, None, None, None, None, None, None, None, None
-
@@ -346 +338 @@
-        x = rezre.search(output.lower() )
-        if x:
-['video_info: film source: 29.97 setting fps to 29.97\n
+__name__, fn_attr(), ['film source: 29.97 setting fps to 29.97
-            fps = '29.97'
-        else:
-            # for build 8047:
-            rezre = re.compile(r'.*frame rate differs from container frame rate: 29.97.*')
-['video_info: Bug in VideoReDo\n
+__name__, fn_attr(), ['Bug in VideoReDo
-            x = rezre.search(output.lower() )
-            if x:
@@ -370 +362 @@
-    else:
-        kbps = None
-['video_info: failed at kbps\n
+__name__, fn_attr(), ['failed at kbps
-
-    #get audio bitrate of source for tivo compatibility test.
@@ -379 +371 @@
-    else:
-        akbps = None
-['video_info: failed at akbps\n
+__name__, fn_attr(), ['failed at akbps
-
-    #get audio codec of source for tivo compatibility test.
@@ -388 +380 @@
-    else:
-        acodec = None
-['video_info: failed at acodec\n
+__name__, fn_attr(), ['failed at acodec
-
-    #get audio frequency of source for tivo compatibility test.
@@ -397 +389 @@
-    else:
-        afreq = None
-['video_info: failed at afreq\n
+__name__, fn_attr(), ['failed at afreq
-
-    info_cache[inFile] = (mtime, (codec, width, height, fps, millisecs, kbps, akbps, acodec, afreq))
-['video_info: Codec=', codec, ' width=', width, ' height=', height, ' fps=', fps, ' millisecs=', millisecs, ' kbps=', kbps, ' akbps=', akbps, ' acodec=', acodec, ' afreq=', afreq, '\n'
+__name__, fn_attr(), ['Codec=', codec, ' width=', width, ' height=', height, ' fps=', fps, ' millisecs=', millisecs, ' kbps=', kbps, ' akbps=', akbps, ' acodec=', acodec, ' afreq=', afreq
-    return codec, width, height, fps, millisecs, kbps, akbps, acodec, afreq
-
@@ -417 +409 @@
-        return True
-    else:
-['supported_format: ', inFile, ' is not supported\n'
+__name__, fn_attr(), ['FALSE, file not supported', inFile
-        return False
-
-def kill(pid):
-['kill: killing pid=', str(pid), '\n'
+__name__, fn_attr(), ['killing pid=', str(pid)
-    if mswindows:
-        win32kill(pid)

plugins/video/video.py

@@ -9 +9 @@
-import config
-import time
+from debug import debug_write, fn_attr
-
-SCRIPTDIR = os.path.dirname(__file__)
@@ -20 +21 @@
-    extensions = None
-
-
-
-
-
-
-
-
-
-
+
+
-
-class Video(Plugin):
@@ -51 +45 @@
-
-    def hack(self, handler, query, subcname):
-['Hack new request ------------------------\n
-['Hack TiVo request is: \n', query, '\n'
+__name__, fn_attr(), ['new request ------------------------
+__name__, fn_attr(), ['TiVo request is: \n', query
-        queryAnchor = ''
-        rightAnchor = ''
@@ -60 +54 @@
-        # not a tivo
-        if not tsn:
-['Hack 
-\n
+__name__, fn_attr(), ['
+
-            tsn = '123456789'
-
@@ -74 +68 @@
-                queryAnchor = queryAnchor.split('/', 1)[-1]
-            leftAnchor, rightAnchor = queryAnchor.rsplit('/', 1)
-['Hack 
+__name__, fn_attr(), ['
-                         ' leftAnchor: ', leftAnchor,
-, '\n'
+
-        try:
-            path, state = self.request_history[tsn]
-        except KeyError:
-            # Never seen this tsn, starting new history
-['New TSN.\n
+__name__, fn_attr(), ['New TSN.
-            path = []
-            state = {}
@@ -89 +83 @@
-            state['time'] = int(time.time()) + 1000
-
-['Hack our saved request is: \n', state['query'], '\n'
+__name__, fn_attr(), ['our saved request is: \n', state['query']
-
-        current_folder = subcname.split('/')[-1]
@@ -98 +92 @@
-        # 1. at the root - This request is always accurate
-        if len(subcname.split('/')) == 1:
-['Hack 
-\n
+__name__, fn_attr(), ['
+
-            path[:] = [current_folder]
-            state['query'] = query
@@ -109 +103 @@
-        # entering a new folder.
-        if 'AnchorItem' not in query:
-['Hack 
-\n
+__name__, fn_attr(), ['
+
-            path[:] = subcname.split('/')
-            state['query'] = query
@@ -125 +119 @@
-        # we know this is the proper page
-        if ''.join(query['AnchorItem']) == 'Hack8.3':
-['Hack 
-,\n
+__name__, fn_attr(), ['
+.
-            return state['query'], path
-
-        # 4. this is a request for a file
-        if 'ItemCount' in query and int(''.join(query['ItemCount'])) == 1:
-['Hack requested a file', '\n
+__name__, fn_attr(), ['requested a file
-            # Everything in this request is right except the container
-            query['Container'] = ['/'.join(path)]
@@ -143 +137 @@
-        # Sleep just in case the erroneous request came first this 
-        # allows a proper request to be processed first
-['Hack maybe erroneous request, sleeping.\n
+__name__, fn_attr(), ['maybe erroneous request, sleeping.
-        time.sleep(.25)
-
@@ -151 +145 @@
-        # First we have to figure out if we are scrolling
-        if 'AnchorOffset' in query:
-['Hack 
-, '\n'
+__name__, fn_attr(), ['
+
-            if leftAnchor == str('/'.join(path)):
-['Hack leftAnchor matched.', '\n
+__name__, fn_attr(), ['leftAnchor matched.
-                query['Container'] = ['/'.join(path)]
-                files, total, start = self.get_files(handler, query, 
-                                                     self.video_file_filter)
-['Hack 
-, '\n'
+__name__, fn_attr(), ['
+
-                # If the first file returned equals the top of the page
-                # then we haven't scrolled pages
-                if files[0] != str(state['page']):
-['Hack this is scrolling within a folder.\n
+__name__, fn_attr(), ['this is scrolling within a folder.
-                    state['page'] = files[0]
-                    return query, path               
@@ -174 +168 @@
-        # request.
-        if (int(time.time()) - state['time']) <= 1:
-['Hack erroneous request, send a 302 error', '\n
+__name__, fn_attr(), ['erroneous request, send a 302 error
-            return None, path
-
@@ -180 +174 @@
-        # this request came by itself; it must be to exit a folder
-        else:
-['Hack 
-\n
+__name__, fn_attr(), ['
+
-            path.pop()
-            state['query'] = {'Command': query['Command'],
@@ -191 +185 @@
-
-        # just in case we missed something.
-['Hack 
-\n
+__name__, fn_attr(), ['
+
-        return state['query'], path
-
@@ -337 +331 @@
-            hackPath = '/'.join(hackPath)
-            print 'Tivo said:', subcname, '|| Hack said:', hackPath
-['Hack 
-, '\n'
+__name__, fn_attr(), ['
+
-            subcname = hackPath
-
-            if not query:
-['Hack sending 302 redirect page', '\n
+__name__, fn_attr(), ['sending 302 redirect page
-                handler.send_response(302)
-                handler.send_header('Location ', 'http://' +

pyTivo.py

@@ -3 +3 @@
-import beacon, httpserver, os, sys
-import config
+from debug import print_conf, fn_attr
-from plugin import GetPlugin
-
@@ -34 +35 @@
-    b.listen()
-
+print_conf(__name__, fn_attr())
-print 'pyTivo is ready.'
-try: