Add: add album to queue #93

Author: sawyerf

app/components/options/OptionsAlbum.js

@@ -6,8 +6,8 @@ import { useTranslation } from 'react-i18next'
 import { ConfigContext } from '~/contexts/config'
 import { getApi, getApiNetworkFirst } from '~/utils/api'
 import { urlStream } from '~/utils/url'
-import { playSong, downloadSong } from '~/utils/player'
-import { SongDispatchContext } from '~/contexts/song'
+import { playSong, downloadSong, addToQueue } from '~/utils/player'
+import { SongContext, SongDispatchContext } from '~/contexts/song'
 import { SettingsContext } from '~/contexts/settings'
 import OptionsPopup from '~/components/popup/OptionsPopup'
 
@@ -18,6 +18,7 @@ const OptionsAlbum = ({ album, isOpen, onClose }) => {
   const refOption = React.useRef()
   const settings = React.useContext(SettingsContext)
   const songDispatch = React.useContext(SongDispatchContext)
+  const song = React.useContext(SongContext)
 
   const playSimilarSongs = () => {
     getApiNetworkFirst(config, 'getSimilarSongs', `id=${album.id}&count=50`)
@@ -44,6 +45,17 @@ const OptionsAlbum = ({ album, isOpen, onClose }) => {
           icon: 'play',
           onPress: playSimilarSongs
         },
+        {
+          name: t('Add to queue'),
+					icon: 'list-ul',
+          onPress: () => {
+            refOption.current.close()
+            for (const song of album.song) {
+              addToQueue(songDispatch, song)
+            }
+          },
+          hidden: !song.queue?.length
+        },
         {
           name: t('Cache all songs'),
           icon: 'cloud-download',

app/components/options/OptionsAlbums.js

@@ -6,12 +6,13 @@ import { useTranslation } from 'react-i18next'
 import { getApi } from '~/utils/api'
 import { ConfigContext } from '~/contexts/config'
 import OptionsPopup from '~/components/popup/OptionsPopup'
-import { playSong } from '~/utils/player'
-import { SongDispatchContext } from '~/contexts/song'
-import { getApiNetworkFirst } from '~/utils/api'
+import { playSong, addToQueue } from '~/utils/player'
+import { SongContext, SongDispatchContext } from '~/contexts/song'
+import { getApiNetworkFirst, getApiCacheFirst } from '~/utils/api'
 
 const OptionsAlbums = ({ albums, indexOptions, setIndexOptions }) => {
   const { t } = useTranslation()
+  const song = React.useContext(SongContext)
   const navigation = useNavigation()
   const config = React.useContext(ConfigContext)
   const refOption = React.useRef()
@@ -38,6 +39,23 @@ const OptionsAlbums = ({ albums, indexOptions, setIndexOptions }) => {
 					icon: 'play',
 					onPress: playSimilarSongs
         },
+        {
+          name: t('Add to queue'),
+					icon: 'list-ul',
+          onPress: () => {
+            refOption.current.close()
+            getApiCacheFirst(config, 'getAlbum', { id: albums[indexOptions].id })
+              .then((json) => {
+                if (json.album?.song?.length) {
+                  for (const song of json.album.song) {
+                    addToQueue(songDispatch, song)
+                  }
+                }
+              })
+              .catch(() => { })
+          },
+          hidden: !song.queue?.length
+        },
         {
           name: t('Go to artist'),
           icon: 'user',

app/components/options/OptionsSongsList.js

@@ -47,14 +47,14 @@ const OptionsSongsList = ({ songs, indexOptions, setIndexOptions, onUpdate = ()
 	}
 
 	const addQueue = () => {
-		if (song.queue) addToQueue(config, songDispatch, songs[indexOptions])
+		if (song.queue) addToQueue(songDispatch, songs[indexOptions])
 		else playSong(config, songDispatch, [songs[indexOptions]], 0)
 		refOption.current.close()
 	}
 
 	const playNext = () => {
 		if (song.queue) {
-			addToQueue(config, songDispatch, songs[indexOptions], song.index + 1)
+			addToQueue(songDispatch, songs[indexOptions], song.index + 1)
 		} else {
 			playSong(config, songDispatch, [songs[indexOptions]], 0)
 		}

app/utils/player.native.js

@@ -278,7 +278,8 @@ export const removeFromQueue = async (songDispatch, index) => {
 	songDispatch({ type: 'removeFromQueue', index })
 }
 
-export const addToQueue = async (config, songDispatch, track, index = null) => {
+// when index is null, add to the end of the queue
+export const addToQueue = (songDispatch, track, index = null) => {
 	songDispatch({ type: 'addToQueue', track, index })
 }
 

app/utils/player.web.js

@@ -332,7 +332,8 @@ export const removeFromQueue = async (songDispatch, index) => {
 	songDispatch({ type: 'removeFromQueue', index })
 }
 
-export const addToQueue = async (_config, songDispatch, track, index = null) => {
+// when index is null, add to the end of the queue
+export const addToQueue = (songDispatch, track, index = null) => {
 	songDispatch({ type: 'addToQueue', track, index })
 }