From fd2179998fd2ed3bbbd97981c89813e44c96c126 Mon Sep 17 00:00:00 2001
From: Luigi311 <git@luigi311.com>
Date: Thu, 26 Jan 2023 11:23:47 -0700
Subject: [PATCH] Fix ssl_bypass for plex

---
 .vscode/settings.json |  3 +++
 src/plex.py           | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..de288e1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}
\ No newline at end of file
diff --git a/src/plex.py b/src/plex.py
index a91b81d..02d8527 100644
--- a/src/plex.py
+++ b/src/plex.py
@@ -262,6 +262,7 @@ class Plex:
         password=None,
         servername=None,
         ssl_bypass=False,
+        session=None,
     ):
         self.baseurl = baseurl
         self.token = token
@@ -269,21 +270,20 @@ class Plex:
         self.password = password
         self.servername = servername
         self.ssl_bypass = ssl_bypass
-        self.plex = self.login(self.baseurl, self.token, ssl_bypass)
+        if ssl_bypass:
+            # Session for ssl bypass
+            session = requests.Session()
+            # By pass ssl hostname check https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
+            session.mount("https://", HostNameIgnoringAdapter())
+        self.session = session
+        self.plex = self.login(self.baseurl, self.token)
         self.admin_user = self.plex.myPlexAccount()
         self.users = self.get_users()
 
-    def login(self, baseurl, token, ssl_bypass=False):
+    def login(self, baseurl, token):
         try:
             if baseurl and token:
-                # Login via token
-                if ssl_bypass:
-                    session = requests.Session()
-                    # By pass ssl hostname check https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
-                    session.mount("https://", HostNameIgnoringAdapter())
-                    plex = PlexServer(baseurl, token, session=session)
-                else:
-                    plex = PlexServer(baseurl, token)
+                plex = PlexServer(baseurl, token, session=self.session)
             elif self.username and self.password and self.servername:
                 # Login via plex account
                 account = MyPlexAccount(self.username, self.password)
@@ -333,7 +333,6 @@ class Plex:
                     user_plex = self.login(
                         self.plex._baseurl,
                         user.get_token(self.plex.machineIdentifier),
-                        self.ssl_bypass,
                     )
 
                 libraries = user_plex.library.sections()
@@ -398,7 +397,9 @@ class Plex:
                     user_plex = self.plex
                 else:
                     user_plex = PlexServer(
-                        self.plex._baseurl, user.get_token(self.plex.machineIdentifier)
+                        self.plex._baseurl,
+                        user.get_token(self.plex.machineIdentifier),
+                        session=self.session,
                     )
 
                 for library, videos in libraries.items():