diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 3c98d5c3..6e467066 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -818,12 +818,14 @@ Torrents
+
@@ -1212,7 +1214,11 @@ %> Use: $Publisher, $Series, $Year
- E.g.: $Publisher/$Series ($Year) = DC Comics/Action Comics (2011)
+ %if 'windows' in mylar.OS_DETECT.lower(): + E.g.: $Publisher\$Series ($Year) = DC Comics\Action Comics (2011) + %else: + E.g.: $Publisher/$Series ($Year) = DC Comics/Action Comics (2011) + %endif
diff --git a/mylar/config.py b/mylar/config.py index 63e45bb7..41accffc 100644 --- a/mylar/config.py +++ b/mylar/config.py @@ -841,6 +841,9 @@ class Config(object): self.ALT_PULL = 2 config.set('Weekly', 'alt_pull', str(self.ALT_PULL)) + #force off public torrents usage as currently broken. + self.ENABLE_PUBLIC = False + try: if not any([self.SAB_HOST is None, self.SAB_HOST == '', 'http://' in self.SAB_HOST[:7], 'https://' in self.SAB_HOST[:8]]): self.SAB_HOST = 'http://' + self.SAB_HOST diff --git a/mylar/webserve.py b/mylar/webserve.py index 74cf4cfa..7db738de 100644 --- a/mylar/webserve.py +++ b/mylar/webserve.py @@ -5370,14 +5370,14 @@ class WebInterface(object): checked_configs = ['enable_https', 'launch_browser', 'syno_fix', 'auto_update', 'annuals_on', 'api_enabled', 'nzb_startup_search', 'enforce_perms', 'sab_to_mylar', 'torrent_local', 'torrent_seedbox', 'rtorrent_ssl', 'rtorrent_verify', 'rtorrent_startonload', 'enable_torrents', 'enable_rss', 'nzbsu', 'nzbsu_verify', - 'dognzb', 'dognzb_verify', 'experimental', 'enable_torrent_search', 'enable_public', 'enable_32p', 'enable_torznab', + 'dognzb', 'dognzb_verify', 'experimental', 'enable_torrent_search', 'enable_32p', 'enable_torznab', 'newznab', 'use_minsize', 'use_maxsize', 'ddump', 'failed_download_handling', 'sab_client_post_processing', 'nzbget_client_post_processing', 'failed_auto', 'post_processing', 'enable_check_folder', 'enable_pre_scripts', 'enable_snatch_script', 'enable_extra_scripts', 'enable_meta', 'cbr2cbz_only', 'ct_tag_cr', 'ct_tag_cbl', 'ct_cbz_overwrite', 'rename_files', 'replace_spaces', 'zero_level', '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'] + 'email_enabled', 'email_enc', 'email_ongrab', 'email_onpost', 'opds_enable', 'opds_authentication', 'opds_metainfo', 'enable_ddl', 'deluge_pause'] #enable_public for checked_config in checked_configs: if checked_config not in kwargs: