Update installed packages

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.1.04 (2021-09-20)
+* (UPDATED) Update installed packages. 
+* (FIXED) Issue with use of ARROW timestamp. 
+
 ## v4.1.03 (2020-09-19)
 * (FIXED) Issue with notifier script execution after V4.1 changes. 
 

plexpy/plexivity_import.py

@@ -333,8 +333,8 @@ def import_from_plexivity(database=None, table_name=None, import_ignore_interval
         else:
             user_id = extracted_xml['user_id']
 
-        session_history = {'started': arrow.get(row['started']).timestamp,
-                           'stopped': arrow.get(row['stopped']).timestamp,
+        session_history = {'started': arrow.get(row['started']).timestamp(),
+                           'stopped': arrow.get(row['stopped']).timestamp(),
                            'rating_key': extracted_xml['rating_key'],
                            'title': row['title'],
                            'parent_title': extracted_xml['parent_title'],

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v4.1.03"
+PLEXPY_RELEASE_VERSION = "v4.1.04"

plexpy/webserve.py

@@ -3298,7 +3298,7 @@ def undelete_server(self, server_id=None, **kwargs):
     @cherrypy.expose
     @requireAuth(member_of("admin"))
     def get_scheduler_table(self, **kwargs):
-
+        x = 0
         schedulers = [
             [plexpy.SCHED, plexpy.SCHED_LIST],
             [plexpy.PMS_SERVERS.SCHED, plexpy.PMS_SERVERS.SCHED_LIST],
@@ -3318,7 +3318,7 @@ def get_scheduler_table(self, **kwargs):
                 if job:
                     run_interval = arrow.get(str(job.trigger.interval), ['H:mm:ss', 'HH:mm:ss'])
                     next_run_time = job.next_run_time
-                    next_run_interval = arrow.get(job.next_run_time).timestamp - arrow.now().timestamp
+                    next_run_interval = arrow.get(job.next_run_time).timestamp() - arrow.now().timestamp()
                 else:
                     run_interval = 0
                     next_run_time = 0
@@ -3327,7 +3327,6 @@ def get_scheduler_table(self, **kwargs):
                                        'run_interval': run_interval,
                                        'next_run_interval': next_run_interval,
                                        'next_run_time': next_run_time})
-
         return serve_template(templatename="scheduler_table.html", scheduled_jobs=scheduled_jobs)
 
     @cherrypy.expose

requirements.txt

@@ -1,66 +1,212 @@
-APScheduler==3.6.3
-arrow==0.15.6
-beautifulsoup4==4.9.0
-bleach==3.1.5
+#
+# This file is autogenerated by pip-compile with python 3.7
+# To update, run:
+#
+#    pip-compile
+#
+aiohttp==3.7.4.post0
+    # via geoip2
+apscheduler==3.7.0
+    # via -r requirements.in
+arrow==1.1.1
+    # via -r requirements.in
+async-timeout==3.0.1
+    # via aiohttp
+attrs==21.2.0
+    # via aiohttp
+beautifulsoup4==4.10.0
+    # via bs4
+bleach==4.1.0
+    # via -r requirements.in
 bs4==0.0.1
-certifi==2020.4.5.1
-cffi==1.14.0
-chardet==3.0.4
-cheroot==8.3.0
-CherryPy==18.6.0
-click==7.1.2
-cloudinary==1.20.0
+    # via -r requirements.in
+certifi==2021.5.30
+    # via
+    #   cloudinary
+    #   requests
+cffi==1.14.6
+    # via cryptography
+chardet==4.0.0
+    # via aiohttp
+charset-normalizer==2.0.6
+    # via requests
+cheroot==8.5.2
+    # via cherrypy
+cherrypy==18.6.1
+    # via -r requirements.in
+click==8.0.1
+    # via pip-tools
+cloudinary==1.26.0
+    # via -r requirements.in
+colorama==0.4.4
+    # via click
 configobj==5.0.6
-cryptography==2.9.2
-distro==1.5.0
-dnspython==1.16.0
+    # via -r requirements.in
+cryptography==3.4.8
+    # via pyopenssl
+distro==1.6.0
+    # via -r requirements.in
+dnspython==2.0.0
+    # via ipwhois
 facebook-sdk==3.1.0
-feedparser==5.2.1
+    # via -r requirements.in
+feedparser==6.0.8
+    # via -r requirements.in
 future==0.18.2
-geoip2==3.0.0
+    # via python-twitter
+geoip2==4.3.0
+    # via -r requirements.in
 gntp==1.0.3
-httpagentparser==1.9.0
-idna==2.9
-importlib-metadata==1.6.0
-importlib-resources==1.5.0
-infi.systray==0.1.12
-ipwhois==1.1.0
-IPy==1.0
-jaraco.classes==2.0
-jaraco.collections==2.1
-jaraco.functools==2.0
-jaraco.text==3.2.0
+    # via -r requirements.in
+httpagentparser==1.9.1
+    # via -r requirements.in
+idna==3.2
+    # via
+    #   requests
+    #   yarl
+importlib-metadata==4.8.1
+    # via
+    #   click
+    #   pep517
+infi.systray==0.1.12 ; sys_platform == "win32"
+    # via -r requirements.in
+ipwhois==1.2.0
+    # via -r requirements.in
+ipy==1.1
+    # via -r requirements.in
+jaraco.classes==3.2.1
+    # via jaraco.collections
+jaraco.collections==3.4.0
+    # via cherrypy
+jaraco.functools==3.3.0
+    # via
+    #   cheroot
+    #   jaraco.text
+    #   tempora
+jaraco.text==3.5.1
+    # via jaraco.collections
 logutils==0.3.5
-Mako==1.1.2
-MarkupSafe==1.1.1
-maxminddb==1.5.2
-mock==3.0.5
-more-itertools==8.2.0
-oauthlib==3.1.0
-packaging==20.3
-paho-mqtt==1.5.0
-passlib==1.7.2
-pip-tools==5.1.1
-portend==2.6
-profilehooks==1.11.2
+    # via -r requirements.in
+mako==1.1.5
+    # via -r requirements.in
+markupsafe==2.0.1
+    # via mako
+maxminddb==2.1.0
+    # via
+    #   -r requirements.in
+    #   geoip2
+more-itertools==8.10.0
+    # via
+    #   cheroot
+    #   cherrypy
+    #   jaraco.classes
+    #   jaraco.functools
+multidict==5.1.0
+    # via
+    #   aiohttp
+    #   yarl
+oauthlib==3.1.1
+    # via
+    #   -r requirements.in
+    #   requests-oauthlib
+packaging==21.0
+    # via bleach
+paho-mqtt==1.5.1
+    # via -r requirements.in
+passlib==1.7.4
+    # via -r requirements.in
+pep517==0.11.0
+    # via pip-tools
+pip-tools==6.2.0
+    # via -r requirements.in
+portend==2.7.1
+    # via
+    #   -r requirements.in
+    #   cherrypy
+profilehooks==1.12.0
+    # via -r requirements.in
 pycparser==2.20
-PyJWT==1.7.1
-PyNMA==1.0
-pyOpenSSL==19.1.0
+    # via cffi
+pyjwt==2.1.0
+    # via -r requirements.in
+pynma==1.0
+    # via -r requirements.in
+pyopenssl==20.0.1
+    # via -r requirements.in
 pyparsing==2.4.7
-python-dateutil==2.8.1
+    # via packaging
+python-dateutil==2.8.2
+    # via arrow
 python-twitter==3.5
-pytz==2020.1
-pywin32==227; sys_platform == "win32"
-requests==2.23.0
+    # via -r requirements.in
+pytz==2021.1
+    # via
+    #   apscheduler
+    #   tempora
+    #   tzlocal
+pywin32==301 ; sys_platform == "win32"
+    # via
+    #   -r requirements.in
+    #   cherrypy
+requests==2.26.0
+    # via
+    #   -r requirements.in
+    #   facebook-sdk
+    #   geoip2
+    #   python-twitter
+    #   requests-oauthlib
 requests-oauthlib==1.3.0
-six==1.14.0
-soupsieve==2.0
-tempora==1.14.1
-tzlocal==2.0.0
-urllib3==1.25.9
+    # via python-twitter
+sgmllib3k==1.0.0
+    # via feedparser
+six==1.16.0
+    # via
+    #   apscheduler
+    #   bleach
+    #   cheroot
+    #   cloudinary
+    #   configobj
+    #   pyopenssl
+    #   python-dateutil
+soupsieve==2.2.1
+    # via beautifulsoup4
+tempora==4.1.1
+    # via portend
+tomli==1.2.1
+    # via pep517
+typing-extensions==3.10.0.2
+    # via
+    #   aiohttp
+    #   arrow
+    #   importlib-metadata
+    #   yarl
+tzlocal==2.1
+    # via
+    #   -r requirements.in
+    #   apscheduler
+urllib3==1.26.6
+    # via
+    #   -r requirements.in
+    #   cloudinary
+    #   geoip2
+    #   requests
 webencodings==0.5.1
-websocket-client==0.56.0
+    # via bleach
+websocket-client==1.2.1
+    # via -r requirements.in
+wheel==0.37.0
+    # via pip-tools
 xmltodict==0.12.0
+    # via -r requirements.in
+yarl==1.6.3
+    # via aiohttp
 zc.lockfile==2.0
-zipp==1.2.0
+    # via cherrypy
+zipp==3.5.0
+    # via
+    #   importlib-metadata
+    #   pep517
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools