Merge branch 'develop'

Author: jaedb

IRIS_VERSION

@@ -1 +1 @@
-3.68.0
+3.69.0

mopidy_iris/__init__.py

@@ -3,7 +3,7 @@
 
 from mopidy import config, ext
 
-__version__ = "3.68.0"
+__version__ = "3.69.0"
 
 logger = logging.getLogger(__name__)
 

mopidy_iris/system.py

@@ -25,7 +25,7 @@ def __init__(self, path):
 
 
 class IrisSystemThread(Thread):
-    _USE_SUDO = True
+    _USE_SUDO = os.environ.get("IRIS_USE_SUDO", True)
 
     def __init__(self, action, ioloop, callback):
         Thread.__init__(self)

mopidy_iris/system.sh

@@ -28,7 +28,10 @@ elif [[ $1 = "restart" ]]; then
 elif [[ $1 = "local_scan" ]]; then
 	START=$(date +%s)
 	if $IS_CONTAINER; then
-		SCAN=$(mopidy --config /config/mopidy.conf local scan)
+		if [ -n "$IRIS_CONFIG_LOCATION" ]; then
+			SCAN=$(mopidy --config $IRIS_CONFIG_LOCATION local scan)
+		else
+			SCAN=$(mopidy --config /config/mopidy.conf local scan)
 	else
 		SCAN=$(sudo mopidyctl local scan)
 	fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.68.0",
+  "version": "3.69.0",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Mopidy-Iris
-version = 3.68.0
+version = 3.69.0
 url = https://github.com/jaedb/iris
 author = James Barnsley
 author_email = james@barnsley.nz

src/js/App.js

@@ -54,7 +54,7 @@ const Content = () => (
         <Route path="settings/debug" element={<Debug />} />
         <Route path="settings/*" element={<Settings />} />
         <Route path="search" element={<Search />} />
-        <Route path="search/:type/:term" element={<Search />} />
+        <Route path="search/:type/:providers/:term" element={<Search />} />
         <Route path="artist/:uri/*" element={<Artist />} />
         <Route path="album/:uri/" element={<Album />} />
         <Route path="album/:uri/:name" element={<Album />} />

src/js/components/SearchResults.js

@@ -9,18 +9,20 @@ import { Grid } from './Grid';
 import { I18n } from '../locale';
 import Button from './Button';
 import { makeSearchResultsSelector, getSortSelector } from '../util/selectors';
+import useSearchQuery from '../util/useSearchQuery';
 
 const SORT_KEY = 'search_results';
 
 const SearchResults = ({
   type,
   all,
 }) => {
-  const { term } = useParams();
+  const { term, providers } = useSearchQuery();
+  const encodedProviders = providers.join(',').replace(/:/g,'');
   const [sortField, sortReverse] = useSelector(
     (state) => getSortSelector(state, SORT_KEY, 'name'),
   );
-  const searchResultsSelector = makeSearchResultsSelector(term, type);
+  const searchResultsSelector = makeSearchResultsSelector(providers, term, type);
   const rawResults = useSelector(searchResultsSelector);
   const encodedTerm = encodeURIComponent(term);
   let results = [...rawResults];
@@ -43,17 +45,17 @@ const SearchResults = ({
       <h4>
         {!all && (
           <span>
-            <URILink uri={`iris:search:all:${encodedTerm}`} uriType="search" unencoded>
+            <URILink uri={`iris:search:all:${encodedProviders}:${encodedTerm}`} uriType="search" unencoded>
               <I18n path="search.title" />
             </URILink>
-            {' '}
+            <span style={{ display: 'inline-block', width: 10 }} />
             <Icon type="fontawesome" name="angle-right" />
-            {' '}
+            <span style={{ display: 'inline-block', width: 10 }} />
             <I18n path={`search.${type}.title`} />
           </span>
         )}
         {all && (
-          <URILink uri={`iris:search:${type}:${encodedTerm}`} uriType="search" unencoded>
+          <URILink uri={`iris:search:${type}:${encodedProviders}:${encodedTerm}`} uriType="search" unencoded>
             <I18n path={`search.${type}.title`} />
           </URILink>
         )}
@@ -66,7 +68,7 @@ const SearchResults = ({
           {type === 'tracks' && (
             <TrackList
               source={{
-                uri: `iris:search:${type}:${encodedTerm}`,
+                uri: `iris:search:${type}:${encodedProviders}:${encodedTerm}`,
                 name: 'Search results',
                 type: 'search',
               }}
@@ -77,7 +79,7 @@ const SearchResults = ({
           {/* <LazyLoadListener enabled={this.props.artists_more && spotify_search_enabled} loadMore={loadMore} /> */}
 
           {resultsCount > results.length && (
-            <Button uri={`iris:search:${type}:${encodedTerm}`} uriType="search" unencoded>
+            <Button uri={`iris:search:${type}:${encodedProviders}:${encodedTerm}`} uriType="search" unencoded>
               <I18n path={`search.${type}.more`} count={resultsCount} />
             </Button>
           )}

src/js/components/URILink.js

@@ -47,7 +47,7 @@ export default memo(({
 
     case 'search':
       var exploded = uri.split(':');
-      to = `/search/${exploded[2]}/${exploded[3]}`;
+      to = `/search/${exploded[2]}/${exploded[3]}/${exploded[4]}`;
       break;
 
     default:

src/js/locale/en.yaml

@@ -337,7 +337,7 @@ search:
   title_window: 'Search: %{term}'
   context_actions:
     sort: Sort
-    source: 'Sources (%{count})'
+    source: Sources
   placeholder: Search
   all:
     title: All