From e3989c2d15e355dafb1e02f55b81c41f6e7e0761 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 4 Sep 2022 20:47:38 +1200
Subject: [PATCH] Removing iris:browse: URI prefix, fixes #829

---
 src/js/components/AddedFrom.js          |   9 +--
 src/js/views/Library/BrowseDirectory.js |   8 +-
 src/js/views/UriRedirect.js             | 102 ++++++------------------
 3 files changed, 35 insertions(+), 84 deletions(-)

diff --git a/src/js/components/AddedFrom.js b/src/js/components/AddedFrom.js
index 7bdfdc1ac..d5e82fdfd 100644
--- a/src/js/components/AddedFrom.js
+++ b/src/js/components/AddedFrom.js
@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import React from 'react';
 import URILink from './URILink';
 import { I18n, i18n } from '../locale';
 import {
@@ -16,7 +15,7 @@ export default ({
 }) => {
   if (!from) return null;
   const { uri, name } = from;
-  const type = uriType(uri);
+  const type = from?.type || uriType(uri);
   let link = null;
   switch (type) {
     case 'discover':
@@ -29,8 +28,8 @@ export default ({
 
     case 'browse':
       let directory = '';
-      if (uri.indexOf('file://')) {
-        directory = uri.substr(uri.lastIndexOf('/'), uri.length);
+      if (uri.indexOf('file://') > -1) {
+        directory = decodeURIComponent(uri.substr(uri.lastIndexOf('/'), uri.length));
       }
       link = (
         <URILink type={type} uri={uri} suffix={directory}>
diff --git a/src/js/views/Library/BrowseDirectory.js b/src/js/views/Library/BrowseDirectory.js
index 459b84d7c..d18bcef21 100755
--- a/src/js/views/Library/BrowseDirectory.js
+++ b/src/js/views/Library/BrowseDirectory.js
@@ -122,8 +122,9 @@ class BrowseDirectory extends React.Component {
     playURIs({
       uris: arrayOf('uri', sortItems(tracks, 'name')),
       from: {
-        name: 'Directory',
-        uri: `iris:browse:${uri}`,
+        name: 'Browse',
+        type: 'browse',
+        uri,
       },
     });
     hideContextMenu();
@@ -233,7 +234,7 @@ class BrowseDirectory extends React.Component {
 
             <TrackList
               context={{
-                uri: `iris:browse:${uri}`,
+                uri,
                 name: 'Browse',
                 type: 'browse',
               }}
@@ -250,6 +251,7 @@ class BrowseDirectory extends React.Component {
 
 const loadingSelector = makeLoadingSelector(['mopidy_library.(browse|lookup)']);
 const mapStateToProps = (state, ownProps) => {
+  console.debug('browser directory', ownProps)
   const {
     mopidy: {
       directory: _directory = {},
diff --git a/src/js/views/UriRedirect.js b/src/js/views/UriRedirect.js
index d5dd7dece..9b4760909 100644
--- a/src/js/views/UriRedirect.js
+++ b/src/js/views/UriRedirect.js
@@ -1,93 +1,43 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
+import React, { useEffect } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { useParams, useNavigate } from 'react-router-dom';
 import Loader from '../components/Loader';
-import * as coreActions from '../services/core/actions';
-import * as uiActions from '../services/ui/actions';
+import { loadUri } from '../services/core/actions';
+import { setWindowTitle } from '../services/ui/actions';
 import { makeLoadingSelector, makeItemSelector } from '../util/selectors';
 import { decodeUri } from '../util/format';
 import { uriType } from '../util/helpers';
 
-class UriRedirect extends React.Component {
-  componentDidMount() {
-    const {
-      uri,
-      item,
-      coreActions: {
-        loadUri,
-      },
-    } = this.props;
+const UriRedirect = () => {
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const { uri: rawUri } = useParams();
+  const uri = decodeUri(rawUri);
+  const loading = useSelector(makeLoadingSelector([`(.*)${uri}(.*)`]));
+  const item = useSelector(makeItemSelector(uri));
+  const redirect = () => navigate(`/${item.type || uriType(uri)}/${rawUri}`);
 
+  useEffect(() => {
     if (item) {
-      this.redirect();
+      redirect();
     } else {
-      loadUri(uri);
+      dispatch(loadUri(uri));
     }
 
-    this.setWindowTitle();
-  }
-
-  componentDidUpdate = ({
-    uri: prevUri,
-  }) => {
-    const {
-      uri,
-      item,
-      coreActions: {
-        loadUri,
-      },
-    } = this.props;
-
-    if (prevUri !== uri) {
-      loadUri(uri);
-      this.setWindowTitle();
-    }
+    dispatch(setWindowTitle(uri));
+  }, []);
 
+  useEffect(() => {
     if (item) {
-      this.redirect();
+      redirect();
+    } else if (!loading) {
+      dispatch(loadUri(uri));
+      dispatch(setWindowTitle(uri));
     }
-  }
-
-  setWindowTitle = () => {
-    const {
-      uri,
-      uiActions: {
-        setWindowTitle,
-      },
-    } = this.props;
-
-    setWindowTitle(uri);
-  }
+  }, [rawUri, loading]);
 
-  redirect = () => {
-    const {
-      uri,
-      item,
-      history,
-    } = this.props;
 
-    history.replace(`/${item.type || uriType(uri)}/${uri}`);
-  }
-
-  render = () => <Loader body loading />;
+  return <Loader loading={loading} body />;
 }
 
-const mapStateToProps = (state, ownProps) => {
-  const { match: { params: { uri: rawUri } } } = ownProps;
-  const uri = decodeUri(rawUri);
-  const loadingSelector = makeLoadingSelector([`(.*)${uri}(.*)`]);
-  const itemSelector = makeItemSelector(uri);
-
-  return {
-    uri,
-    loading: loadingSelector(state),
-    item: itemSelector(state),
-  };
-};
-
-const mapDispatchToProps = (dispatch) => ({
-  uiActions: bindActionCreators(uiActions, dispatch),
-  coreActions: bindActionCreators(coreActions, dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(UriRedirect);
+export default UriRedirect;