Merge pull request #22 from cmathews393/21-periodic-sync-for-docker

21 periodic sync for docker

Author: cmathews393

.github/workflows/docker-image.yml

@@ -0,0 +1,34 @@
+name: Docker Push On Commit
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - test
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_APP_PASS }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            0xchloe/spotiplex:${{ github.ref_name == 'main' && 'latest' || github.ref_name }}
+

default.env

@@ -1,12 +1,12 @@
-SPOTIPLEX_LIDARR_SYNC=True
-USERS=
+SPOTIPLEX_LIDARR_SYNC=False
+USERS=Alyssa
 WORKERS=5
 REPLACE=False
 INTERVAL=86400
 SPOTIPLEX_MANUAL_PLAYLISTS=
-SPOTIFY_API_KEY=
-SPOTIFY_API_ID=
-PLEX_URL=
-PLEX_TOKEN=
-LIDARR_IP=
-LIDARR_TOKEN=
+LIDARR_IP=http://192.168.1.160:8686
+LIDARR_TOKEN=1d2b2305bcc84f05b927c3edb0c6b7ab
+PLEX_URL=https://192.168.1.160:32400
+PLEX_TOKEN=uMYZ7xr-FpuxDFXEcHu3
+SPOTIFY_API_ID=1c24cfd2111a4024a7858439bbb7ddb4
+SPOTIFY_API_KEY=5098dca2086c4a8398f72fa35e614fec

spotiplex/main.py

@@ -21,9 +21,7 @@ def __init__(self):
                 "plex_users": os.environ.get("USERS", ""),
                 "worker_count": int(os.environ.get("WORKERS", 1)),
                 "seconds_interval": int(os.environ.get("INTERVAL", 86400)),
-                "manual_playlists": os.environ.get(
-                    "SPOTIPLEX_MANUAL_PLAYLISTS", "False"
-                ),
+                "manual_sync": os.environ.get("SPOTIPLEX_MANUAL_PLAYLISTS", "False"),
             }
             write_config("spotiplex", spotiplex_config)
 
@@ -63,10 +61,20 @@ def __init__(self):
         if self.lidarr_sync == "true":
             self.sync_lists = self.lidarr_api.get_lidarr_playlists()
         else:
-            self.sync_lists = self.config.get("manual_playlists")
+            self.sync_lists = []
+        manual_playlists = self.config.get("manual_playlists", "")
+        if manual_playlists:
+            # If manual_playlists is a string of items separated by commas, split it into a list
+            manual_playlists_list = manual_playlists.split(",")
+            # Then extend self.sync_lists with this list
+            self.sync_lists.extend(manual_playlists_list)
+            print(manual_playlists)
+        self.sync_my_user = False
         currentuser = self.plex_service.plex.myPlexAccount().username.lower()
+
         if currentuser in self.user_list:
             self.user_list.remove(currentuser)
+            self.sync_my_user = True
 
     def process_for_user(self, user):
         if user:
@@ -92,9 +100,24 @@ def process_for_user(self, user):
                     print(f"Thread resulted in an error: {e}")
 
     def is_running_in_docker():
-        return os.path.exists("/.dockerenv")
+        # Check for the .dockerenv file
+        if os.path.exists("/.dockerenv"):
+            return True
+
+        # Check for container-related entries in /proc/1/cgroup
+        try:
+            with open("/proc/1/cgroup", "rt") as f:
+                if any("docker" in line or "containerd" in line for line in f):
+                    return True
+        except Exception:
+            pass
+
+        return False
 
     def run(self):
+        self.plex_service = PlexService()
+        if self.sync_my_user:
+            self.process_for_user(None)
         for user in self.user_list:
             self.process_for_user(user)
         if self.seconds_interval > 0:
@@ -103,32 +126,32 @@ def run(self):
                 schedule.run_pending()
                 time.sleep(1)
 
-    def extract_playlist_id(playlist_url):  # parse playlist ID from URL if applicable
+    def extract_playlist_id(playlist_url):
+        # Check and extract the part after "?si="
         if "?si=" in playlist_url:
             playlist_url = playlist_url.split("?si=")[0]
 
-        return (
-            playlist_url.split("playlist/")[1]
-            if "playlist/" in playlist_url
-            else playlist_url
-        )
+        # Check and extract the part after "playlist/"
+        if "playlist/" in playlist_url:
+            playlist_url = playlist_url.split("playlist/")[1]
+
+        return playlist_url
 
     def process_playlist(
-        self, playlists, plex_service, spotify_service, replace_existing
+        self, playlist, plex_service, spotify_service, replace_existing
     ):
-        for playlist in playlists:
-            try:
-                playlist_id = Spotiplex.extract_playlist_id(playlist)
-                print(playlist_id)
-                playlist_name = spotify_service.get_playlist_name(playlist_id)
-                spotify_tracks = spotify_service.get_playlist_tracks(playlist_id)
-                plex_tracks = plex_service.check_tracks_in_plex(spotify_tracks)
-                plex_service.create_or_update_playlist(
-                    playlist_name, playlist_id, plex_tracks
-                )
-                print(f"Processed playlist '{playlist_name}'.")
-            except Exception as e:
-                print(f"Error processing playlist '{playlist}':", e)
+        try:
+            playlist_id = Spotiplex.extract_playlist_id(playlist)
+            print(playlist_id)
+            playlist_name = spotify_service.get_playlist_name(playlist_id)
+            spotify_tracks = spotify_service.get_playlist_tracks(playlist_id)
+            plex_tracks = plex_service.check_tracks_in_plex(spotify_tracks)
+            plex_service.create_or_update_playlist(
+                playlist_name, playlist_id, plex_tracks
+            )
+            print(f"Processed playlist '{playlist_name}'.")
+        except Exception as e:
+            print(f"Error processing playlist '{playlist}':", e)
 
     def configurator(self):
         # Config for Spotiplex

spotiplex/plex.py

@@ -40,9 +40,7 @@ def check_tracks_in_plex(self, spotify_tracks):
 
         return plex_tracks
 
-    def create_or_update_playlist(
-        self, playlist_name, playlist_id, tracks
-    ):
+    def create_or_update_playlist(self, playlist_name, playlist_id, tracks):
         existing_playlist = self.find_playlist_by_name(playlist_name)
         if existing_playlist:
             if self.replace:
@@ -68,3 +66,15 @@ def create_playlist(self, playlist_name, playlist_id, tracks):
         except Exception as e:
             print(f"Error creating playlist {playlist_name}: {e}")
             return None
+
+    def list_active_streams(self):
+        """Lists all users currently playing media and the media they are playing."""
+        sessions = self.plex.sessions()
+        if sessions:
+            for session in sessions:
+                user = session.usernames[0] if session.usernames else "Unknown User"
+                title = session.title
+                # Depending on your requirement, you might also want to include session.type (movie, episode, etc.)
+                print(f"User '{user}' is playing '{title}'")
+        else:
+            print("No active streams.")