diff --git a/Mylar.py b/Mylar.py index b4b86877..a313f50f 100755 --- a/Mylar.py +++ b/Mylar.py @@ -308,6 +308,7 @@ def main(): 'opds_authentication': mylar.CONFIG.OPDS_AUTHENTICATION, 'opds_username': mylar.CONFIG.OPDS_USERNAME, 'opds_password': mylar.CONFIG.OPDS_PASSWORD, + 'opds_pagesize': mylar.CONFIG.OPDS_PAGESIZE, } # Try to start the server. diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 6e467066..14bf7981 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -244,6 +244,10 @@
Access the OPDS server at http://mylarhost/opds/ - keep in mind your scheme (http or https), your hostname, port, and any http_root you may have set.
+
+ + +
<% opds_notes = "Require authentication for OPDS. If checked\nyou will need to provide a username/password.\nThe service user name will work (if set). Additionally,\nyou can provide a user with only OPDS access below.\nNOTE: If this is not checked, OPDS will be available\nwithout a password." diff --git a/mylar/config.py b/mylar/config.py index 41accffc..374dad14 100644 --- a/mylar/config.py +++ b/mylar/config.py @@ -368,6 +368,7 @@ _CONFIG_DEFINITIONS = OrderedDict({ 'OPDS_USERNAME': (str, 'OPDS', None), 'OPDS_PASSWORD': (str, 'OPDS', None), 'OPDS_METAINFO': (bool, 'OPDS', False), + 'OPDS_PAGESIZE': (int, 'OPDS', 30), }) diff --git a/mylar/opds.py b/mylar/opds.py index 299ba194..e2bb4faf 100644 --- a/mylar/opds.py +++ b/mylar/opds.py @@ -39,7 +39,7 @@ class OPDS(object): def __init__(self): self.cmd = None - self.PAGE_SIZE=30 + self.PAGE_SIZE=mylar.CONFIG.OPDS_PAGESIZE self.img = None self.issue_id = None self.file = None diff --git a/mylar/webserve.py b/mylar/webserve.py index ddf2f19a..c1c2e03a 100644 --- a/mylar/webserve.py +++ b/mylar/webserve.py @@ -5149,6 +5149,7 @@ class WebInterface(object): "opds_username": mylar.CONFIG.OPDS_USERNAME, "opds_password": mylar.CONFIG.OPDS_PASSWORD, "opds_metainfo": helpers.checked(mylar.CONFIG.OPDS_METAINFO), + "opds_pagesize": mylar.CONFIG.OPDS_PAGESIZE, "dlstats": dlprovstats, "dltotals": freq_tot, "alphaindex": mylar.CONFIG.ALPHAINDEX @@ -5397,7 +5398,7 @@ class WebInterface(object): 'lowercase_filenames', 'autowant_upcoming', 'autowant_all', 'comic_cover_local', 'alternate_latest_series_covers', 'cvinfo', 'snatchedtorrent_notify', 'prowl_enabled', 'prowl_onsnatch', 'pushover_enabled', 'pushover_onsnatch', 'boxcar_enabled', 'boxcar_onsnatch', 'pushbullet_enabled', 'pushbullet_onsnatch', 'telegram_enabled', 'telegram_onsnatch', 'slack_enabled', 'slack_onsnatch', - 'email_enabled', 'email_enc', 'email_ongrab', 'email_onpost', 'opds_enable', 'opds_authentication', 'opds_metainfo', 'enable_ddl', 'deluge_pause'] #enable_public + 'email_enabled', 'email_enc', 'email_ongrab', 'email_onpost', 'opds_enable', 'opds_authentication', 'opds_metainfo', 'opds_pagesize', 'enable_ddl', 'deluge_pause'] #enable_public for checked_config in checked_configs: if checked_config not in kwargs: