Merge pull request #13 from rosskouk/feature-shuffle-9

Feature shuffle 9
rosskouk · Oct 22, 2022 · a316b7b · a316b7b
2 parents 672ce84 + 3f7cdab
commit a316b7b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 __pycache__
 env
-sphinx/_build
+sphinx/_build/*
+!sphinx/_build/.gitkeep
 sphinx/resources/*.bkp
 sphinx/resources/*.dtmp
 asknavidrome.log

diff --git a/alexa.json b/alexa.json
@@ -176,6 +176,16 @@
                         "Play random music",
                         "Play random songs"
                     ]
+                },
+                {
+                    "name": "NaviSonicRandomiseQueue",
+                    "slots": [],
+                    "samples": [
+                        "randomise the queue",
+                        "randomise",
+                        "shuffle",
+                        "shuffle the queue"
+                    ]
                 }
             ],
             "types": [

diff --git a/skill/app.py b/skill/app.py
@@ -39,6 +39,7 @@
 # Get service configuration
 #
 
+logger.info('AskNavidrome 0.6!')
 logger.debug('Getting configutration from the environment...')
 
 try:
@@ -572,6 +573,24 @@ def handle(self, handler_input: HandlerInput) -> Response:
             return controller.start_playback('play', speech, card, track_details, handler_input)
 
 
+class NaviSonicRandomiseQueue(AbstractRequestHandler):
+    """Handle NaviSonicRandomiseQueue Intent
+
+    Shuffle the current play queue
+    """
+
+    def can_handle(self, handler_input: HandlerInput) -> bool:
+        return is_intent_name('NaviSonicRandomiseQueue')(handler_input)
+
+    def handle(self, handler_input: HandlerInput) -> Response:
+        logger.debug('In NaviSonicRandomiseQueue Handler')
+
+        play_queue.shuffle()
+        play_queue.sync()
+
+        return handler_input.response_builder.response
+
+
 class NaviSonicSongDetails(AbstractRequestHandler):
     """Handle NaviSonicSongDetails Intent
 
@@ -630,7 +649,6 @@ def handle(self, handler_input: HandlerInput) -> Response:
 
         return handler_input.response_builder.response
 
-
 #
 # AudioPlayer Handlers
 #
@@ -899,6 +917,7 @@ def process(self, handler_input: HandlerInput, response: Response):
 sb.add_request_handler(NaviSonicPlayFavouriteSongs())
 sb.add_request_handler(NaviSonicPlayMusicByGenre())
 sb.add_request_handler(NaviSonicPlayMusicRandom())
+sb.add_request_handler(NaviSonicRandomiseQueue())
 sb.add_request_handler(NaviSonicSongDetails())
 sb.add_request_handler(NaviSonicStarSong())
 sb.add_request_handler(NaviSonicUnstarSong())

diff --git a/sphinx/_build/.gitkeep b/sphinx/_build/.gitkeep
diff --git a/sphinx/index.rst b/sphinx/index.rst
@@ -98,6 +98,8 @@ Supported Intents
 +-------------------------------------------+--------------------------------------------+-------------------------------------+
 | :class:`~app.NaviSonicPlayFavouriteSongs` | Play your starred / favourite songs        | Play my favourite songs             |
 +-------------------------------------------+--------------------------------------------+-------------------------------------+
+| :class:`~app.NaviSonicRandomiseQueue`     | Shuffle / randomise the current play queue | Shuffle the queue                   |
++-------------------------------------------+--------------------------------------------+-------------------------------------+
 | :class:`~app.NaviSonicSongDetails`        | Give details on the playing track          | What is playing                     |
 +-------------------------------------------+--------------------------------------------+-------------------------------------+
 | :class:`~app.NaviSonicStarSong`           | Star / favourite a song                    | Star this song                      |
@@ -413,7 +415,7 @@ Code Documentation
 ******************
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
    :caption: Contents:
 
 AskNavidrome main