Changeset 2e8ebf09c0fd7949e1582427e051c085a4680ef5

Timestamp:

02/14/08 12:02:55 (11 months ago)

Author:

William McBrine <wmcbrine@gmail.com>

git-committer:

William McBrine <wmcbrine@gmail.com> 1203012175 -0500

git-parent:

[2d5fc8dc7dd4d09bb5c0b36509122fee90388494], [ad2b033f75151402c125239e7e9a155e62877e58]

git-author:

William McBrine <wmcbrine@gmail.com> 1203012175 -0500

Message:

Merge branch 'master' into subfolders-8.3

Conflicts:

plugins/video/video.py

Files:

• plugins/video/video.py (modified) (1 diff)
• pyTivo.py (modified) (3 diffs)

plugins/video/video.py

@@ -43 +43 @@
-    count = 0
-    request_history = {}
+
+    def pre_cache(self, full_path):
+        if Video.video_file_filter(self, full_path):
+            transcode.supported_format(full_path)
-
-    def video_file_filter(self, full_path, type=None):

pyTivo.py

@@ -3 +3 @@
-import beacon, httpserver, os, sys
-import config
+from plugin import GetPlugin
-
-port = config.getPort()
@@ -10 +11 @@
-for section, settings in config.getShares():
-    httpd.add_container(section, settings)
+    # Precaching of files: does a recursive list of base path
+    if settings.get('precache', 'False').lower() == 'true':
+        plugin = GetPlugin(settings.get('type'))
+        if hasattr(plugin,'pre_cache'):
+            print 'Pre-caching the', section, 'share.'
+            pre_cache_filter = getattr(plugin, 'pre_cache')
+
+            def build_recursive_list(path):
+                for f in os.listdir(path):
+                    f = os.path.join(path, f)
+                    if os.path.isdir(f):
+                        build_recursive_list(f)
+                    else:
+                        pre_cache_filter(f)
+
+            build_recursive_list(settings.get('path'))
-
-b = beacon.Beacon()
@@ -17 +34 @@
-    b.listen()
-
+print 'pyTivo is ready.'
-try:
-    httpd.serve_forever()