Fix Jellyfin tracker request issues

trackma/tracker/jellyfin.py

@@ -36,7 +36,11 @@ class JellyfinTracker(tracker.TrackerBase):
     def __init__(self, messenger, tracker_list, config, watch_dirs, redirections=None):
         self.config = config
 
-        self.host_port = self.config['jellyfin_host']+":"+self.config['jellyfin_port']
+        self.host_port = "{protocol}://{host}:{port}".format(
+            host=self.config['jellyfin_host'],
+            port=self.config['jellyfin_port'],
+            protocol='https' if self.config['jellyfin_ssl'] else 'http'
+        )
         self.api_key = self.config['jellyfin_api_key']
         self.username = self.config['jellyfin_user']
 

trackma/ui/gtk/data/settingswindow.ui

@@ -678,11 +678,25 @@
                                 <property name="top_attach">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbox_jellyfin_ssl">
+                                <property name="label" translatable="yes">Use SSL</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Password</property>
+                                <property name="label" translatable="yes">API key</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>

trackma/ui/gtk/settingswindow.py

@@ -70,6 +70,7 @@ class SettingsWindow(Gtk.Window):
     radio_tracker_jellyfin = Gtk.Template.Child()
     entry_jellyfin_host = Gtk.Template.Child()
     spin_jellyfin_port = Gtk.Template.Child()
+    checkbox_jellyfin_ssl = Gtk.Template.Child()
     entry_jellyfin_username = Gtk.Template.Child()
     entry_jellyfin_api_key = Gtk.Template.Child()
 
@@ -194,6 +195,7 @@ def _load_config(self):
             self.engine.get_config('jellyfin_host'))
         self.spin_jellyfin_port.set_value(
             int(self.engine.get_config('jellyfin_port')))
+        self.checkbox_jellyfin_ssl.set_active(self.engine.get_config('jellyfin_ssl'))
         self.entry_jellyfin_username.set_text(
             self.engine.get_config('jellyfin_user'))
         self.entry_jellyfin_api_key.set_text(
@@ -335,6 +337,7 @@ def _enable_plex(self, enable):
     def _enable_jellyfin(self, enable):
         self.entry_jellyfin_host.set_sensitive(enable)
         self.spin_jellyfin_port.set_sensitive(enable)
+        self.checkbox_jellyfin_ssl.set_sensitive(enable)
         self.entry_jellyfin_username.set_sensitive(enable)
         self.entry_jellyfin_api_key.set_sensitive(enable)
 
@@ -389,6 +392,7 @@ def save_config(self):
             'plex_passwd', self.entry_plex_password.get_text())
         self.engine.set_config(
             'jellyfin_host', self.entry_jellyfin_host.get_text())
+        self.engine.set_config('jellyfin_ssl', self.checkbox_jellyfin_ssl.get_active())
         self.engine.set_config('jellyfin_port', str(
             int(self.spin_jellyfin_port.get_value())))
         self.engine.set_config(

trackma/ui/qt/settings.py

@@ -149,6 +149,7 @@ def __init__(self, parent, worker, config, configfile):
         g_jellyfin.setFlat(True)
         self.jellyfin_host = QLineEdit()
         self.jellyfin_port = QLineEdit()
+        self.jellyfin_ssl = QCheckBox()
         self.jellyfin_user = QLineEdit()
         self.jellyfin_api_key = QLineEdit()
 
@@ -159,12 +160,13 @@ def __init__(self, parent, worker, config, configfile):
                                 0, 1, 1, 1)
         g_jellyfin_layout.addWidget(self.jellyfin_port,
                                 0, 2, 1, 2)
+        g_jellyfin_layout.addWidget(QLabel('Use SSL'), 1, 0, 1, 1)
+        g_jellyfin_layout.addWidget(self.jellyfin_ssl, 1,2,1,1)
         g_jellyfin_layout.addWidget(
-            QLabel('API and User'),                   1, 0, 1, 1)
+            QLabel('API and User'),                   2, 0, 1, 1)
         g_jellyfin_layout.addWidget(self.jellyfin_api_key,
-                                1, 1, 1, 1)
-        g_jellyfin_layout.addWidget(self.jellyfin_user,
-                                1, 2, 1, 2)
+                                2, 1, 1, 1)
+        g_jellyfin_layout.addWidget(self.jellyfin_user, 2, 2, 1, 2)
 
         g_jellyfin.setLayout(g_jellyfin_layout)
 
@@ -537,6 +539,7 @@ def _load(self):
 
         self.jellyfin_host.setText(engine.get_config('jellyfin_host'))
         self.jellyfin_port.setText(engine.get_config('jellyfin_port'))
+        self.jellyfin_ssl.setChecked(engine.get_config('jellyfin_ssl'))
         self.jellyfin_user.setText(engine.get_config('jellyfin_user'))
         self.jellyfin_api_key.setText(engine.get_config('jellyfin_api_key'))
 
@@ -647,6 +650,7 @@ def _save(self):
 
         engine.set_config('jellyfin_host',         self.jellyfin_host.text())
         engine.set_config('jellyfin_port',         self.jellyfin_port.text())
+        engine.set_config('jellyfin_ssl',        self.jellyfin_ssl.isChecked())
         engine.set_config('jellyfin_user',         self.jellyfin_user.text())
         engine.set_config('jellyfin_api_key',       self.jellyfin_api_key.text())
 
@@ -738,6 +742,7 @@ def switch_jellyfin_state(self, state):
         self.jellyfin_host.setEnabled(state)
         self.jellyfin_port.setEnabled(state)
         self.jellyfin_user.setEnabled(state)
+        self.jellyfin_ssl.setEnabled(state)
         self.jellyfin_api_key.setEnabled(state)
 
     def tracker_type_change(self, checked):

trackma/utils.py

@@ -601,6 +601,7 @@ class APIFatal(TrackmaFatal):
     'plex_ssl': False,
     'jellyfin_host': "localhost",
     'jellyfin_port': "8096",
+    'jellyfin_ssl': False,
     'jellyfin_api_key': '',
     'jellyfin_user': '',
     'kodi_host': "localhost",