Add SOPDS_TELEBOT_PROXY Settings

README.md

@@ -397,3 +397,6 @@ existing user in the Simple OPDS database.
 
 **SOPDS_TELEBOT_MAXITEMS** - The maximum number of simultaneously displayed items in the Telegram message
 (by default SOPDS_TELEBOT_MAXITEMS = 10)    
+
+**SOPDS_TELEBOT_PROXY** - Proxy address    
+(example: https://68.183.231.47:8080/)

README_RUS.md

@@ -411,3 +411,6 @@ MySQL по сравнению с sqlite работает гораздо быст
 
 **SOPDS_TELEBOT_MAXITEMS** - Максимальное число одновременно выводимых элеменов в сообщении Telegram
 (по умолчанию SOPDS_TELEBOT_MAXITEMS = 10)    
+
+**SOPDS_TELEBOT_PROXY** - Адрес прокси     
+(например: https://68.183.231.47:8080/)
\ No newline at end of file

opds_catalog/management/commands/sopds_telebot.py

@@ -341,8 +341,11 @@ class Command(BaseCommand):
         writepid(self.pidfile)
         quit_command = 'CTRL-BREAK' if sys.platform == 'win32' else 'CONTROL-C'
         self.stdout.write("Quit the sopds_telebot with %s.\n"%quit_command)
+        REQUEST_KWARGS={}
+        if config.SOPDS_TELEBOT_AUTH:
+            REQUEST_KWARGS['proxy_url'] = config.SOPDS_TELEBOT_PROXY
         try:
-            updater = Updater(token=config.SOPDS_TELEBOT_API_TOKEN)
+            updater = Updater(token=config.SOPDS_TELEBOT_API_TOKEN, request_kwargs=REQUEST_KWARGS)
             start_command_handler = CommandHandler('start', self.startCommand)
             getBook_handler = MessageHandler(Filters.text, self.getBooks)
             download_handler = RegexHandler('^/download\d+$',self.downloadBooks)

opds_catalog/settings.py

@@ -7,7 +7,7 @@ from constance import config
 loglevels={'debug':logging.DEBUG,'info':logging.INFO,'warning':logging.WARNING,'error':logging.ERROR,'critical':logging.CRITICAL,'none':logging.NOTSET}
 NOZIP_FORMATS = ['epub', 'mobi']
 
-VERSION = "0.47-devel"
+VERSION = "0.48-devel"
 TITLE = getattr(settings, "SOPDS_TITLE", "SimpleOPDS")
 SUBTITLE = getattr(settings, "SOPDS_SUBTITLE", "SimpleOPDS Catalog by www.sopds.ru. Version %s."%VERSION)
 ICON = getattr(settings, "SOPDS_ICON", "/static/images/favicon.ico")

sopds/settings.py

@@ -177,6 +177,7 @@ CONSTANCE_CONFIG = OrderedDict([
     ('SOPDS_TELEBOT_API_TOKEN', ('', _('Telegramm API Token'))),
     ('SOPDS_TELEBOT_AUTH', (True,_('Enable telebot authentication. Test presense telegram username in local users database (case insensetive).'))),
     ('SOPDS_TELEBOT_MAXITEMS', (10, _('Max items on page'))),
+    ('SOPDS_TELEBOT_PROXY', ('', _('proxy for telebot'))),
     
     ('SOPDS_AUTH', (True,_('Enable authentication'))),
     ('SOPDS_ALPHABET_MENU', (True,_('Enable alphabet submenu'))),   
@@ -220,7 +221,7 @@ CONSTANCE_CONFIG_FIELDSETS = {
     '2. Server Options': ('SOPDS_AUTH', 'SOPDS_ALPHABET_MENU', 'SOPDS_DOUBLES_HIDE', 'SOPDS_COVER_SHOW', 'SOPDS_SPLITITEMS', 'SOPDS_MAXITEMS', 'SOPDS_TITLE_AS_FILENAME', 'SOPDS_NOCOVER_PATH'),    
     '3. Scanner Options': ('SOPDS_FB2SAX','SOPDS_ZIPSCAN','SOPDS_ZIPCODEPAGE', 'SOPDS_INPX_ENABLE', 'SOPDS_INPX_SKIP_UNCHANGED', 'SOPDS_INPX_TEST_ZIP', 'SOPDS_INPX_TEST_FILES', 'SOPDS_DELETE_LOGICAL'),
     '4. Scanner Shedule': ('SOPDS_SCAN_SHED_MIN', 'SOPDS_SCAN_SHED_HOUR', 'SOPDS_SCAN_SHED_DAY','SOPDS_SCAN_SHED_DOW'),
-    '5. Telegramm Bot Options': ('SOPDS_TELEBOT_API_TOKEN','SOPDS_TELEBOT_AUTH','SOPDS_TELEBOT_MAXITEMS'),
+    '5. Telegramm Bot Options': ('SOPDS_TELEBOT_API_TOKEN','SOPDS_TELEBOT_AUTH','SOPDS_TELEBOT_MAXITEMS', 'SOPDS_TELEBOT_PROXY'),
     '6. Converters Options': ('SOPDS_FB2TOEPUB', 'SOPDS_FB2TOMOBI', 'SOPDS_TEMP_DIR'),
     '7. Log & PID Files': ('SOPDS_SERVER_LOG', 'SOPDS_SCANNER_LOG', 'SOPDS_TELEBOT_LOG','SOPDS_SERVER_PID','SOPDS_SCANNER_PID','SOPDS_TELEBOT_PID'),
 }