Changeset 60d4905cac9de8210e94fd05da1189d83dbf22d6

Timestamp:

02/09/08 23:01:04 (1 year ago)

Author:

William McBrine <wmcbrine@gmail.com>

git-committer:

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

git-parent:

[ebc6b29e44be3ef4b94a64e8ab642d8a633e57ae]

git-author:

KRKeegan <kevin@krkeegan.com> 1202592099 -0800

Message:

New: Limit shares which appear on certain TiVos?

Adapted from ticket #32:
There is now a share option available under any [_tivo_12345] section. This option takes a comma seperated list of available shares. Only the shares listed will appear on that specific tivo. Incorrect shares are ignored.

For example, the following conf file would be used to prevent share Adult from being seen on the TiVo with a tsn=12345, only Movies and Photos would be seen on this TiVo. Adult would still be visible on ALL other TiVos? in the network.
[_tivo_12345]
shares = Movies, Photos

[Adult]
type = video
path = /store/Adult

[Movies]
type = video
path = /store/Movies

[Photos]
type = photo
path = /store/Photos

[Server]
debug = true
ffmpeg = /usr/bin/ffmpeg
hack83 = true
port = 9032

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

@@ -74 +74 @@
-
-    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