PlexBot/__init__.py

@@ -1,6 +1,8 @@
 """
 Plex music bot for discord.
 
+Do not import this module, it is intended to be
+used exclusively within a docker environment.
 """
 import logging
 import sys
@@ -17,7 +19,7 @@ plex_log = logging.getLogger("Plex")
 bot_log = logging.getLogger("Bot")
 
 
-def load_config(basedir: str,filename: str) -> Dict[str, str]:
+def load_config(filename: str) -> Dict[str, str]:
     """Loads config from yaml file
 
     Grabs key/value config pairs from a file.
@@ -33,12 +35,12 @@ def load_config(basedir: str,filename: str) -> Dict[str, str]:
     """
     # All config files should be in /config
     # for docker deployment.
-    filename = Path(basedir, filename)
+    filename = Path("/config", filename)
     try:
         with open(filename, "r") as config_file:
             config = yaml.safe_load(config_file)
     except FileNotFoundError:
-        root_log.fatal("Configuration file not found at '"+str(filename)+"'.")
+        root_log.fatal("Configuration file not found.")
         sys.exit(-1)
 
     # Convert str level type to logging constant
@@ -54,7 +56,7 @@ def load_config(basedir: str,filename: str) -> Dict[str, str]:
     config["plex"]["log_level"] = levels[config["plex"]["log_level"].upper()]
     config["discord"]["log_level"] = levels[config["discord"]["log_level"].upper()]
 
-    if config["lyrics"] and config["lyrics"]["token"].lower() == "none":
+    if config["lyrics"]["token"].lower() == "none":
-        config["lyrics"] = None
+        config["lyrics"]["token"] = None
 
     return config

PlexBot/__main__.py

@@ -11,11 +11,7 @@ from .bot import General
 from .bot import Plex
 
 # Load config from file
-configdir = "config"
+config = load_config("config.yaml")
-from os import geteuid
-if geteuid() == 0:
-    configdir = "/config"
-config = load_config(configdir,"config.yaml")
 
 BOT_PREFIX = config["discord"]["prefix"]
 TOKEN = config["discord"]["token"]
@@ -24,10 +20,7 @@ BASE_URL = config["plex"]["base_url"]
 PLEX_TOKEN = config["plex"]["token"]
 LIBRARY_NAME = config["plex"]["library_name"]
 
-if config["lyrics"]:
+LYRICS_TOKEN = config["lyrics"]["token"]
-    LYRICS_TOKEN = config["lyrics"]["token"]
-else:
-    LYRICS_TOKEN = None
 
 # Set appropiate log level
 root_log = logging.getLogger()

PlexBot/bot.py

@@ -6,6 +6,7 @@ from urllib.request import urlopen
 import requests
 
 import discord
+import lyricsgenius
 from async_timeout import timeout
 from discord import FFmpegPCMAudio
 from discord.ext import commands
@@ -31,13 +32,11 @@ Plex:
     play <SONG_NAME> - Play a song from the plex server.
     album <ALBUM_NAME> - Queue an entire album to play.
     playlist <PLAYLIST_NAME> - Queue an entire playlist to play.
-    show_playlists <ARG> <ARG> - Query for playlists with a name matching any of the arguments.
     lyrics - Print the lyrics of the song (Requires Genius API)
     np - Print the current playing song.
     stop - Halt playback and leave vc.
     pause - Pause playback.
     resume - Resume playback.
-    skip - Skip the current song.
     clear - Clear play queue.
 
 [] - Optional args.
@@ -183,7 +182,6 @@ class Plex(commands.Cog):
         self.bot_prefix = bot.command_prefix
 
         if kwargs["lyrics_token"]:
-            import lyricsgenius
             self.genius = lyricsgenius.Genius(kwargs["lyrics_token"])
         else:
             plex_log.warning("No lyrics token specified, lyrics disabled")
@@ -268,15 +266,6 @@ class Plex(commands.Cog):
         except NotFound:
             raise MediaNotFoundError("Playlist cannot be found")
 
-    def _get_playlists(self):
-        """
-        Search the Plex music db for playlist
-
-        Returns:
-            List of plexapi.playlist
-        """
-        return self.pms.playlists()
-
     async def _play(self):
         """
         Heavy lifting of playing songs
@@ -447,7 +436,7 @@ class Plex(commands.Cog):
         return embed, art_file
 
     @staticmethod
-    def _build_embed_playlist(self, playlist, title, descrip):
+    def _build_embed_playlist(self, playlist):
         """
         Creates a pretty embed card for playlists
 
@@ -466,14 +455,13 @@ class Plex(commands.Cog):
             None
         """
         # Grab the relevant thumbnail
-        try:
         img_stream = requests.get(self.pms.url(playlist.composite, True), stream=True).raw
         img = io.BytesIO(img_stream.read())
-        except:
-            raise MediaNotFoundError("no image available")
 
         # Attach to discord embed
         art_file = discord.File(img, filename="image0.png")
+        title = "Added playlist to queue"
+        descrip = f"{playlist.title}"
 
         embed = discord.Embed(
             title=title, description=descrip, colour=discord.Color.red()
@@ -626,52 +614,13 @@ class Plex(commands.Cog):
         except VoiceChannelError:
             pass
 
-        try:
+        bot_log.debug("Added to queue - %s", title)
-            embed, img = self._build_embed_playlist(self, playlist, "Added playlist to queue", playlist.title)
+        embed, img = self._build_embed_playlist(self, playlist)
         await ctx.send(embed=embed, file=img)
 
         for item in playlist.items():
             if (item.TYPE == "track"):
                 await self.play_queue.put(item)
-            bot_log.debug("Added to queue - %s", title)
-        except MediaNotFoundError:
-            await ctx.send(message="Playlist "+title+" seems to be empty!")
-            bot_log.debug("Playlist empty - %s", title)
-    @command()
-    async def show_playlists(self, ctx, *args):
-        """
-        User command to show playlists
-
-        Searchs plex db and shows playlists matching.
-
-        Args:
-            ctx: discord.ext.commands.Context message context from command
-            *args: String filter for playlist names
-
-        Returns:
-            None
-
-        Raises:
-            None
-        """
-        # Save the context to use with async callbacks
-        self.ctx = ctx
-
-        playlists = self._get_playlists()
-
-        try:
-            await self._validate(ctx)
-        except VoiceChannelError:
-            pass
-
-        for playlist in playlists:
-            if args and not any(arg in playlist.title for arg in args):
-                continue
-            from datetime import timedelta
-            if playlist.duration:
-                seconds = playlist.duration / 1000
-                embed, img = self._build_embed_playlist(self, playlist, playlist.title, "{:0>8}".format(str(timedelta(seconds=seconds))))
-                await ctx.send(embed=embed, file=img)
 
     @command()
     async def stop(self, ctx):