Changeset 1888

Timestamp:

16/11/08 18:56:51 (8 weeks ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11170

Message:

Small bug fixes

Location:

freevo

Files:

• local_conf.py.example (modified) (3 diffs)
• setup.py (modified) (1 diff)
• src/main.py (modified) (1 diff)

freevo/local_conf.py.example

@@ -1632 +1632 @@
 # WWW_PAGES = [
 #     #   Label                      Title                                  Page
-#     (_('Home'),                 _('Home'),                               'index.rpy'), 
-#     (_('TV Guide'),             _('View TV Listings'),                   'guide.rpy'), 
-#     (_('Scheduled Recordings'), _('View Scheduled Recordings'),          'record.rpy'), 
-#     (_('Favorites'),            _('View Favorites'),                     'favorites.rpy'), 
-#     (_('Media Library'),        _('View Media Library'),                 'library.rpy'), 
-#     (_('Manual Recording'),     _('Schedule a Manual Recording'),        'manualrecord.rpy'), 
+#     (_('Home'),                 _('Home'),                               'index.rpy'),
+#     (_('TV Guide'),             _('View TV Listings'),                   'guide.rpy'),
+#     (_('Scheduled Recordings'), _('View Scheduled Recordings'),          'record.rpy'),
+#     (_('Favorites'),            _('View Favorites'),                     'favorites.rpy'),
+#     (_('Media Library'),        _('View Media Library'),                 'library.rpy'),
+#     (_('Manual Recording'),     _('Schedule a Manual Recording'),        'manualrecord.rpy'),
 #     ('Config',                    'Configuration Information',           'config.rpy'),
 #     ('Plugins',                   'Plug-in Configuration Information',   'pluginconfig.rpy'),
@@ -1644 +1644 @@
 #     ('My Page',                   'My Page Title'                        'mypage.html'),
 #     ('My Site',                   'My Site Title'                        'mysite/'),
-#     (_('Search'),               _('Advanced Search Page'),               'search.rpy'), 
+#     (_('Search'),               _('Advanced Search Page'),               'search.rpy'),
 #     (_('Help'),                 _('View Online Help and Documentation'), 'help/')
 # ]
@@ -1691 +1691 @@
 #
 # VIDEO_SHOW_REGEXP = "s?([0-9]|[0-9][0-9])[xe]([0-9]|[0-9][0-9])[^0-9]"
+
+#
+# Directory containing images for TV shows. A TV show matches the regular
+# expression VIDEO_SHOW_REGEXP, e.g. "Name 3x10 - Title". If an image
+# name.(png|jpg) (lower-case) is in this directory, it will be taken as cover
+# image
+#
+# VIDEO_SHOW_DATA_DIR = None
 
 

freevo/setup.py

@@ -27 +27 @@
     ('twisted', 'http://www.twistedmatrix.com/'),
     ('twisted.web.microdom', 'http://www.twistedmatrix.com/'),
+    ('Numeric', 'http://numeric.scipy.org/'),
 ]
 

freevo/src/main.py

@@ -109 +109 @@
     sys.exit(0)
 
+import rc      # The RemoteControl class.
 import util    # Various utilities
 import osd     # The OSD class, used to communicate with the OSD daemon
 import menu    # The menu widget class
-import skin    # The skin class
-import rc      # The RemoteControl class.
+try:
+    import skin    # The skin class
+except pygame.error, why:
+    sys.exit(why)
 
 from item import Item