Merge branch 'develop'

Dockerfile

@@ -28,8 +28,8 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 # Install libspotify-dev from apt.mopidy.com
-RUN wget -q -O - https://apt.mopidy.com/mopidy.gpg \
-  | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add - \
+RUN mkdir -p /usr/local/share/keyrings \
+  && wget -q -O /usr/local/share/keyrings/mopidy-archive-keyring.gpg https://apt.mopidy.com/mopidy.gpg \
   && wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/buster.list \
   && apt-get update \
   && apt-get install -y libspotify-dev mopidy-spotify \

IRIS_VERSION

@@ -1 +1 @@
-3.62.0
+3.63.0

mopidy_iris/core.py

@@ -39,10 +39,7 @@ class IrisCore(pykka.ThreadingActor):
         "seed_tracks": [],
         "results": [],
     }
-    data = {
-        "commands": [],
-        "pinned": [],
-    }
+    data = {}
     ioloop = None
 
     @classmethod
@@ -60,9 +57,9 @@ def setup(self, config, core):
     def start(self):
         logger.info("Starting Iris " + Extension.version)
 
-        # Load our commands and pinned items from file
         self.data["commands"] = self.load_from_file("commands")
         self.data["pinned"] = self.load_from_file("pinned")
+        self.data["shared_config"] = self.load_from_file("shared_config")
 
     ##
     # Mopidy is shutting down
@@ -409,6 +406,7 @@ def get_config(self, *args, **kwargs):
                 "genius_authorization_url": self.config["iris"][
                     "genius_authorization_url"
                 ],
+                "shared_config": self.data["shared_config"],
             }
         }
 
@@ -879,6 +877,16 @@ def get_pinned(self, *args, **kwargs):
     def set_pinned(self, *args, **kwargs):
         return self.set_data("pinned", *args, **kwargs)
 
+    ##
+    # Portable configuration template for other users to import
+    ##
+
+    def get_shared_config(self, *args, **kwargs):
+        return self.get_data("shared_config", *args, **kwargs)
+
+    def set_shared_config(self, *args, **kwargs):
+        return self.set_data("shared_config", *args, **kwargs)
+
     ##
     # Commands
     ##

mopidy_iris/static/index.html

@@ -140,7 +140,7 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1646809993";
+	var build = "1652000473";
 	var version = "3.62.0";
 
 	// Construct the script tag

src/js/App.js

@@ -30,6 +30,7 @@ import Search from './views/Search';
 import Settings from './views/Settings';
 import Discover from './views/Discover/Discover';
 import Library from './views/Library/Library';
+import ModalStateListener from './components/ModalStateListener';
 import Modals from './views/Modals/Modals';
 
 import { scrollTo, isTouchDevice } from './util/helpers';
@@ -251,6 +252,7 @@ const App = () => {
         options={{ enableMouseEvents: true }}
       >
         <div className="body">
+          <ModalStateListener />
           <Switch>
             <Route
               path="/modal"

src/js/components/ModalStateListener.js

@@ -0,0 +1,16 @@
+import { useSelector } from 'react-redux';
+import { useHistory, useLocation } from 'react-router-dom';
+
+const ModalStateListener = () => {
+  const { name } = useSelector((state) => state.ui.modal || {});
+  const history = useHistory();
+  const location = useLocation();
+
+  if (name && location.pathname.indexOf(`modal/${name}`) < 0) {
+    history.push(`modal/${name}`);
+  }
+
+  return null;
+}
+
+export default ModalStateListener;

src/js/components/Notifications.js

@@ -45,56 +45,6 @@ const Notification = ({
         </div>
       );
 
-    case 'share-configuration-received':
-      return (
-        <div className="notification__wrapper">
-          <div className="notification notification--info" data-duration={duration}>
-            <Icon
-              name="close"
-              className="notification__close-button"
-              onClick={() => dispatch(removeNotification(key, true))}
-            />
-            <h4 className="notification__title">
-              <I18n path="modal.share_configuration.import.title" />
-            </h4>
-            <div className="notification__content">
-              <p>
-                <I18n path="modal.share_configuration.import.subtitle" />
-              </p>
-              <ul>
-                {configuration.ui && (
-                  <li><I18n path="modal.share_configuration.interface" /></li>
-                )}
-                {configuration.spotify && (
-                  <li><I18n path="services.spotify.title" /></li>
-                )}
-                {configuration.lastfm && (
-                  <li><I18n path="services.lastfm.title" /></li>
-                )}
-                {configuration.genius && (
-                  <li><I18n path="services.genius.title" /></li>
-                )}
-                {configuration.snapcast && (
-                  <li><I18n path="services.snapcast.title" /></li>
-                )}
-              </ul>
-              <p>
-                <I18n path="modal.share_configuration.import.do_you_want_to_import" />
-              </p>
-            </div>
-            <div className="notification__actions">
-              <Button
-                className="notification__actions__item"
-                onClick={() => importConfiguration(key, configuration)}
-                tracking={{ category: 'ShareConfiguration', action: 'Import' }}
-              >
-                <I18n path="modal.share_configuration.import.import_now" />
-              </Button>
-            </div>
-          </div>
-        </div>
-      );
-
     default:
       return (
         <div className="notification__wrapper" key={key}>
@@ -185,7 +135,7 @@ const NotificationItems = () => {
 
     dispatch(uiActions.removeNotification(notification_key, true));
     dispatch(uiActions.createNotification({
-      content: i18n('modal.share_configuration.import.successful'),
+      content: i18n('modal.shared_config.imported'),
     }));
   }
 

src/js/locale/dictionaries.js

@@ -8,6 +8,7 @@ import _ja from './ja.yaml';
 import _pl from './pl.yaml';
 import _it from './it.yaml';
 import _es from './es.yaml';
+import _ru from './ru.yaml';
 
 // Merge languages with English. This provides English fallbacks to untranslated
 // fields without breaking the UI (with blanks)
@@ -27,6 +28,8 @@ const it = {};
 merge(it, en, _it);
 const es = {};
 merge(es, en, _es);
+const ru = {};
+merge(ru, en, _ru);
 
 const available = [
   { key: 'en', name: en.name },
@@ -37,6 +40,7 @@ const available = [
   { key: 'ja', name: ja.name },
   { key: 'nl', name: nl.name },
   { key: 'pl', name: pl.name },
+  { key: 'ru', name: ru.name },
   { key: 'sv', name: sv.name },
 ];
 
@@ -50,6 +54,7 @@ export default {
   ja,
   pl,
   it,
+  ru,
   available,
 };
 
@@ -63,5 +68,6 @@ export {
   ja,
   pl,
   it,
+  ru,
   available,
 };

src/js/locale/en.yaml

@@ -421,7 +421,10 @@ settings:
       upgrade_available: 'Upgrade available (%{version})'
       upgrade: 'Upgrade to %{version}'
       up_to_date: Up to date
-    share_configuration: Share configuration
+    shared_configuration:
+      label: Share configuration
+      share: Export/share
+      import: Import from server
     restart: Restart server
     reset: Reset settings
   about:
@@ -569,23 +572,46 @@ modal:
     title: Now playing
     title_window: '%{name} by %{artist} (now playing)'
     lyrics: Lyrics
-  share_configuration:
-    title: Share configuration
-    subtitle: Push your authorizations and interface settings to another, connected user
+  import_configuration:
+    title: Import configuration
+    configurations: Configurations to import
+    import_now: Import now
+  shared_config:
     no_peers: No peer connections
     recipients: Recipients
     configurations: Configurations
-    authorization: '%{service} authorization'
-    logged_in_as: 'Logged in as %{name}'
-    snapcast_description: Server connection details
-    interface: Interface settings
-    interface_description: Theme, sorting, filters, etc
-    import:
-      title: Configuration shared
-      subtitle: 'Another user has shared their configuration with you. This includes:'
-      do_you_want_to_import: Do you want to import this?
-      import_now: Import now
-      successful: Import successful
+    import_now: Import now
+    imported: Import successful
+    share: Share now
+    shared: Share successful
+    push:
+      title: Share configuration
+      subtitle: Push your authorizations and interface settings to another, connected user
+    pushed:
+      title: Configuration received
+      subtitle: Another user has shared their configuration with you
+    server:
+      title: Import configuration
+      subtitle: Import third-party authorizations and other settings
+      label: Server
+      description: Save to server for any user to import
+    config:
+      label: Configurations
+      ui:
+        label: User interface
+        description: Theme, sorting, filters, etc
+      spotify:
+        label: Spotify authorisation
+        description: 'Logged in as %{name}'
+      lastfm:
+        label: LastFM authorisation
+        description: 'Logged in as %{name}'
+      genius:
+        label: Genius authorisation
+        description: 'Logged in as %{name}'
+      snapcast:
+        label: Snapcast
+        description: Server connection details
   reset:
     title: Reset Iris
     subtitle: Clear your local configuration, storage information or cache