Merge branch 'develop_rentals' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_rentals

This commit is contained in:
Ruud committed 2014-05-06 14:14:41 +02:00
commit e5bcea59b5
1 file changed
+18 -1
@@ -104,16 +104,19 @@ class IMDBAutomation(IMDBBase):
'theater': 'http://www.imdb.com/movies-in-theaters/', 'theater': 'http://www.imdb.com/movies-in-theaters/',
'top250': 'http://www.imdb.com/chart/top', 'top250': 'http://www.imdb.com/chart/top',
'boxoffice': 'http://www.imdb.com/chart/', 'boxoffice': 'http://www.imdb.com/chart/',
'rentals': 'http://www.imdb.com/boxoffice/rentals',
} }
chart_names = { chart_names = {
'theater': 'IMDB - Movies in Theaters', 'theater': 'IMDB - Movies in Theaters',
'top250': 'IMDB - Top 250 Movies', 'top250': 'IMDB - Top 250 Movies',
'boxoffice': 'IMDB - Box Office', 'boxoffice': 'IMDB - Box Office',
'rentals': 'IMDB - Top DVD rentals',
} }
chart_order = { chart_order = {
'theater': 2, 'theater': 2,
'top250': 4, 'top250': 5,
'boxoffice': 3, 'boxoffice': 3,
'rentals': 4,
} }
first_table = ['boxoffice'] first_table = ['boxoffice']
@@ -240,6 +243,13 @@ config = [{
'description': 'New Movies <a href="http://www.imdb.com/movies-in-theaters/">In-Theaters</a> chart', 'description': 'New Movies <a href="http://www.imdb.com/movies-in-theaters/">In-Theaters</a> chart',
'default': True, 'default': True,
}, },
{
'name': 'automation_charts_rentals',
'type': 'bool',
'label': 'DVD Rentals',
'description': 'Top DVD <a href="http://www.imdb.com/boxoffice/rentals/">rentals</a> chart',
'default': True,
},
{ {
'name': 'automation_charts_top250', 'name': 'automation_charts_top250',
'type': 'bool', 'type': 'bool',
@@ -282,6 +292,13 @@ config = [{
'description': 'IMDB <a href="http://www.imdb.com/chart/top/">TOP 250</a> chart', 'description': 'IMDB <a href="http://www.imdb.com/chart/top/">TOP 250</a> chart',
'default': False, 'default': False,
}, },
{
'name': 'chart_display_rentals',
'type': 'bool',
'label': 'DVD Rentals',
'description': 'Top DVD <a href="http://www.imdb.com/boxoffice/rentals/">rentals</a> chart',
'default': True,
},
{ {
'name': 'chart_display_boxoffice', 'name': 'chart_display_boxoffice',
'type': 'bool', 'type': 'bool',