Fix #175: Show URI if no name is set for metadata models.

tkem · Feb 14, 2016 · f99cbba · f99cbba
1 parent a0fad31
commit f99cbba
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 21 deletions.
diff --git a/www/app/library/browse.html b/www/app/library/browse.html
@@ -37,9 +37,9 @@
           <img ng-class="{'mopidy-mobile-thumbnail-track': !images[item.uri].uri}"
                ng-src="{{images[item.uri].uri || thumbnail.src}}"
                >
-          <h2>{{item.name}}</h2>
+          <h2>{{item.name || item.uri}}</h2>
           <h3 class="mopidy-mobile-artists" ng-show="item.artists.length">
-            <span ng-repeat="artist in item.artists">{{artist.name}}</span>
+            <span ng-repeat="artist in item.artists">{{artist.name || artist.uri}}</span>
           </h3>
           <h4>{{item.album.name || item.genre || item.comment}}</h4>
           <button class="mopidy-mobile-button-icon mopidy-mobile-icon-menu icon-accessory"
@@ -51,7 +51,7 @@ <h4>{{item.album.name || item.genre || item.comment}}</h4>
                   ui-sref="library.browse({type: item.type, name: item.name, uri: item.uri})"
                   >
           <i ng-class="'mopidy-mobile-icon-' + item.type"></i>
-          {{item.name}}
+          {{item.name || item.uri}}
           <i class="mopidy-mobile-icon-link icon-accessory"></i>
         </ion-item>
       </div>

diff --git a/www/app/library/lookup.html b/www/app/library/lookup.html
@@ -20,9 +20,9 @@
         <img ng-class="{'mopidy-mobile-thumbnail-track': !images[track.uri].uri}"
              ng-src="{{images[track.uri].uri || thumbnail.src}}"
              >
-        <h2>{{track.name}}</h2>
+        <h2>{{track.name || track.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="track.artists.length">
-          <span ng-repeat="artist in track.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in track.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <h4>{{track.album.name || track.genre || track.comment}}</h4>
         <button class="mopidy-mobile-button-icon mopidy-mobile-icon-menu icon-accessory"

diff --git a/www/app/library/search.html b/www/app/library/search.html
@@ -20,7 +20,7 @@
         <img ng-class="{'mopidy-mobile-thumbnail-artist': !images[artist.uri].uri}"
              ng-src="{{images[artist.uri].uri || thumbnail.src}}"
              >
-        <h2>{{artist.name}}</h2>
+        <h2>{{artist.name || artist.uri}}</h2>
         <h3></h3>
         <i class="mopidy-mobile-icon-link icon-accessory"></i>
       </ion-item>
@@ -31,9 +31,9 @@ <h3></h3>
         <img ng-class="{'mopidy-mobile-thumbnail-album': !images[album.uri].uri}"
              ng-src="{{images[album.uri].uri || thumbnail.src}}"
              >
-        <h2>{{album.name}}</h2>
+        <h2>{{album.name || album.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="album.artists.length">
-          <span ng-repeat="artist in album.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in album.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <i class="mopidy-mobile-icon-link icon-accessory"></i>
       </ion-item>
@@ -44,9 +44,9 @@ <h3 class="mopidy-mobile-artists" ng-show="album.artists.length">
         <img ng-class="{'mopidy-mobile-thumbnail-track': !images[track.uri].uri}"
              ng-src="{{images[track.uri].uri || thumbnail.src}}"
              >
-        <h2>{{track.name}}</h2>
+        <h2>{{track.name || track.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="track.artists.length">
-          <span ng-repeat="artist in track.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in track.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <h4>{{track.album.name || track.genre || track.comment}}</h4>
         <button class="mopidy-mobile-button-icon mopidy-mobile-icon-menu icon-accessory"

diff --git a/www/app/locale/de.js b/www/app/locale/de.js
@@ -88,6 +88,7 @@
         'Track info': 'Titelinformationen',
         'Tracklist': 'Titel',
         'Track': 'Titel',
+        'URI': 'URI',
         'URL': 'URL',
         'Version {version}': 'Version {{version}}',
         '{count} tracks': '{{count}} Titel',

diff --git a/www/app/locale/en.js b/www/app/locale/en.js
@@ -88,6 +88,7 @@
         'Track info': 'Track info',
         'Tracklist': 'Tracklist',
         'Track': 'Track',
+        'URI': 'URI',
         'URL': 'URL',
         'Version {version}': 'Version {{version}}',
         '{count} tracks': '{{count}} tracks',

diff --git a/www/app/main/trackinfo.html b/www/app/main/trackinfo.html
@@ -1,4 +1,8 @@
 <div class="list">
+  <div class="item" ng-if="track.uri">
+    <h2>{{track.uri}}</h2>
+    <h4 translate>URI</h4>
+  </div>
   <div class="item" ng-if="track.name">
     <h2>{{track.name}}</h2>
     <h4 translate>Track</h4>

diff --git a/www/app/playback/playback.html b/www/app/playback/playback.html
@@ -32,10 +32,13 @@
     </ion-refresher>
 
     <div class="row row-top row-no-padding responsive-portrait">
-      <div class="col">
-        <h2>{{track.name || ('Nothing playing' | translate)}}</h2>
+      <div class="col" ng-if="!track">
+        <h2 translate>Nothing playing</h2>
+      </div>
+      <div class="col" ng-if="track">
+        <h2>{{track.name || track.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="track.artists.length">
-          <span ng-repeat="artist in track.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in track.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <h4>{{streamTitle || track.album.name || track.genre || track.comment}}</h4>
       </div>

diff --git a/www/app/playlists/index.edit.html b/www/app/playlists/index.edit.html
@@ -19,7 +19,7 @@
   <ion-content>
     <ion-list show-delete="true">
       <ion-item ng-repeat="playlist in playlists | playlistOrder : order">
-        <h2>{{playlist.name}}</h2>
+        <h2>{{playlist.name || playlist.uri}}</h2>
         <h4>{{getScheme(playlist.uri)}}</h4>
         <ion-delete-button class="ion-minus-circled" ng-click="confirmDelete(playlist)">
         </ion-delete-button>

diff --git a/www/app/playlists/index.view.html b/www/app/playlists/index.view.html
@@ -19,7 +19,7 @@
                 collection-repeat="playlist in playlists | playlistOrder : order"
                 ui-sref="playlists.lookup.list({uri: playlist.uri})"
                 >
-        <h2>{{playlist.name}}</h2>
+        <h2>{{playlist.name || playlist.uri}}</h2>
         <h4>{{getScheme(playlist.uri)}}</h4>
         <i class="mopidy-mobile-icon-link icon-accessory"></i>
       </ion-item>

diff --git a/www/app/playlists/select.html b/www/app/playlists/select.html
@@ -1,7 +1,7 @@
 <ion-list>
-  <ion-item ng-click="actions.addToPlaylist(playlist.uri, track) && $buttonTapped({}, $event)" 
+  <ion-item ng-click="actions.addToPlaylist(playlist.uri, track) && $buttonTapped({}, $event)"
             ng-repeat="playlist in playlists"
             >
-    {{playlist.name}}
+    {{playlist.name || playlist.uri}}
   </ion-item>
 </ion-list>
diff --git a/www/app/tracklist/edit.html b/www/app/tracklist/edit.html
@@ -25,9 +25,9 @@
         <img ng-class="{'mopidy-mobile-thumbnail-track': !images[tlTrack.track.uri].uri}"
              ng-src="{{images[tlTrack.track.uri].uri || thumbnail.src}}"
              >
-        <h2>{{tlTrack.track.name}}</h2>
+        <h2>{{tlTrack.track.name || tlTrack.track.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="tlTrack.track.artists.length">
-          <span ng-repeat="artist in tlTrack.track.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in tlTrack.track.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <h4>{{tlTrack.track.album.name || tlTrack.track.genre || tlTrack.track.comment}}</h4>
         <ion-delete-button class="ion-minus-circled" ng-click="remove(tlTrack)">

diff --git a/www/app/tracklist/view.html b/www/app/tracklist/view.html
@@ -43,9 +43,9 @@
         <img ng-class="{'mopidy-mobile-thumbnail-track': !images[tlTrack.track.uri].uri}"
              ng-src="{{images[tlTrack.track.uri].uri || thumbnail.src}}"
              >
-        <h2>{{tlTrack.track.name}}</h2>
+        <h2>{{tlTrack.track.name || tlTrack.track.uri}}</h2>
         <h3 class="mopidy-mobile-artists" ng-show="tlTrack.track.artists.length">
-          <span ng-repeat="artist in tlTrack.track.artists">{{artist.name}}</span>
+          <span ng-repeat="artist in tlTrack.track.artists">{{artist.name || artist.uri}}</span>
         </h3>
         <h4>{{tlTrack.track.album.name || tlTrack.track.genre || tlTrack.track.comment}}</h4>
         <button class="mopidy-mobile-button-icon mopidy-mobile-icon-menu icon-accessory"