Changeset b469cf58a56f01b71ccdb1b4ebb73904dc39c8ba

Timestamp:

02/10/08 01:02:43 (1 year ago)

Author:

wgw <tjm1100@gmail.com>

git-committer:

wgw <tjm1100@gmail.com> 1202626963 -0600

git-parent:

[a567b71819c8005b304615b039ff22c5447c7a3e], [d037640ab285301da7b4f2fa513ce393ce194b86]

git-author:

wgw <tjm1100@gmail.com> 1202626963 -0600

Message:

Merge branch 'subfolders-8.3' of git://repo.or.cz/pyTivo/wmcbrine

Files:

• config.py (modified) (1 diff)
• httpserver.py (modified) (1 diff)

config.py

@@ -42 +42 @@
-    return True
-
-
+tsn=''
-    shares = [(section, dict(config.items(section)))
-              for section in config.sections()
-              if not(section.startswith('_tivo_') or section == 'Server')]
+
+    if config.has_section('_tivo_' + tsn):
+        if config.has_option('_tivo_' + tsn, 'shares'):
+            # clean up leading and trailing spaces & make sure ref is valid
+            tsnshares = []
+            for x in config.get('_tivo_' + tsn, 'shares').split(','):
+                y = x.lstrip().rstrip()
+                if config.has_section(y):
+                    tsnshares += [(y, dict(config.items(y)))]
+            if tsnshares:
+                shares = tsnshares
-
-    for name, data in shares:

httpserver.py

@@ -88 +88 @@
-
-    def root_container(self):
+         tsn = self.headers.getheader('TiVo_TCD_ID', '')
+         tsnshares = config.getShares(tsn)
+         tsncontainers = {}
+         for section, settings in tsnshares:
+            settings['content_type'] = GetPlugin(settings['type']).CONTENT_TYPE
+            tsncontainers[section] = settings
-         t = Template(file=os.path.join(SCRIPTDIR, 'templates',
-                                        'root_container.tmpl'))
-self.server.
+tsn
-         t.hostname = socket.gethostname()
-         t.escape = escape