Merge pull request #241 from tobexyz/chore/prepareRelease520

Chore/prepare release520

Author: tobexyz

fastlane/metadata/android/en-US/changelogs/50200.txt

@@ -1,5 +1,7 @@
 Version 5.2.0
 - fixed app crash on unknown http codes in upnp responses
 - fixed pause/play on yaacc renderer
+- improved media type extraction and fallback title for SAF content
+- server now uses the media filename or title as filename in content url
 - allow stopping the app via action button in notification
 - stop the app completely if idle in background

yaacc/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="50101"
-    android:versionName="5.1.1-SNAPSHOT">
+    android:versionCode="50200"
+    android:versionName="5.2.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

yaacc/src/main/java/de/yaacc/player/AVTransportPlayer.java

@@ -718,7 +718,8 @@ private void proceedWithSetURI(PlayableItem playableItem, Service<?, ?> service)
         String metadata;
         try {
             metadata = new DIDLParser().generate((item == null) ? new DIDLContent() : new DIDLContent().addItem(item), false);
-
+            String itemTitle = item != null ? item.getTitle() : "null";
+            YaaccLogger.d(getClass().getName(), "DIDL Metadata generated - Item title: " + itemTitle + " - Metadata XML: " + metadata.substring(0, Math.min(500, metadata.length())));
         } catch (Exception e) {
             YaaccLogger.d(getClass().getName(), "Error while generating Didl-Item xml: " + e);
             metadata = "";
@@ -750,6 +751,7 @@ service, modifyProxyUrlWithDeviceId(playableItem.getUri().toString()), actionSta
                 getHttpRequestSender());
         YaaccLogger.d(getClass().getName(), "Original URI: " + playableItem.getUri().toString());
         YaaccLogger.d(getClass().getName(), "Modified URI: " + modifyProxyUrlWithDeviceId(playableItem.getUri().toString()));
+        YaaccLogger.d(getClass().getName(), "SetAVTransportURI - Title: " + (item != null ? item.getTitle() : "null") + ", Metadata length: " + metadata.length());
         executorService.execute(setAVTransportURI);
         waitForActionComplete(actionState);
         int tries = 1;

yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerService.java

@@ -187,6 +187,7 @@ public void onCreate() {
         public void onReceive(Context context, Intent intent) {
             int total = intent.getIntExtra("files_indexed", 0);
             cacheFilesIndexed = total;
+            cacheCurrentFolder = ""; // Clear folder when indexing completes
             showNotification(); // Update notification with final cache status
         }
     };
@@ -391,13 +392,20 @@ private void showNotification() {
 
         // Duration cache status
         SAFCacheManager cacheManager = SAFCacheManager.getInstance(this);
-        if (cacheManager.isPreloading()) {
+        boolean isPreloading = cacheManager.isPreloading();
+        YaaccLogger.d(getClass().getName(), "showNotification: isPreloading=" + isPreloading + ", cacheSize=" + cacheManager.getCacheSize() + ", filesIndexed=" + cacheFilesIndexed);
+        
+        if (isPreloading) {
             statusBuilder.append(" | ⏳ Indexing: ").append(cacheFilesIndexed);
             if (!cacheCurrentFolder.isEmpty()) {
                 statusBuilder.append(" (").append(cacheCurrentFolder).append(")");
             }
+            YaaccLogger.d(getClass().getName(), "Notification: showing indexing progress - " + cacheFilesIndexed + " files");
         } else if (cacheManager.getCacheSize() > 0) {
             statusBuilder.append(" | ✓ Cache: ").append(cacheManager.getCacheSize());
+            YaaccLogger.d(getClass().getName(), "Notification: showing cache size - " + cacheManager.getCacheSize() + " items");
+        } else {
+            YaaccLogger.d(getClass().getName(), "Notification: no cache or indexing (isPreloading=" + isPreloading + ", cacheSize=" + cacheManager.getCacheSize() + ")");
         }
 
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(this, Yaacc.NOTIFICATION_CHANNEL_ID)

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/ContentBrowser.java

@@ -149,6 +149,26 @@ public String getUriString(YaaccContentDirectory contentDirectory, String id, Mi
         return "http://" + contentDirectory.getIpAddress() + ":"
                 + YaaccUpnpServerService.PORT + "/res/" + id + "/file." + fileExtension;
     }
+    
+    public String getUriString(YaaccContentDirectory contentDirectory, String id, MimeType mimeType, String filename, String contentUri) {
+        String fileExtension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType.toString());
+        if (fileExtension == null) {
+            fileExtension = mimeType.getSubtype();
+        }
+
+        if (contentUri != null) {
+            // SAF format with filename
+            return "http://" + contentDirectory.getIpAddress() + ":"
+                    + YaaccUpnpServerService.PORT + "/saf/" + id + "/" + contentUri + "." + fileExtension;
+        }
+        
+        // Non-SAF format with filename included for renderer title
+        String safeFilename = filename != null && !filename.isEmpty() 
+            ? filename.replaceAll("[^a-zA-Z0-9._-]", "_")
+            : "file";
+        return "http://" + contentDirectory.getIpAddress() + ":"
+                + YaaccUpnpServerService.PORT + "/res/" + id + "/" + safeFilename + "." + fileExtension;
+    }
 
     public String getDLNAAttributes(MimeType mimetype) {
         String mime = mimetype.toString();

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/ImageByBucketNameItemBrowser.java

@@ -83,7 +83,7 @@ public DIDLObject browseMeta(YaaccContentDirectory contentDirectory,
                 @SuppressLint("Range") MimeType mimeType = MimeType.valueOf(mimeTypeString);
                 // file parameter only needed for media players which decide the
                 // ability of playing a file by the file extension
-                String uri = getUriString(contentDirectory, id, mimeType);
+                String uri = getUriString(contentDirectory, id, mimeType, name, null);
                 String albumArtUri = "http://" + contentDirectory.getIpAddress() + ":"
                         + YaaccUpnpServerService.PORT + "/thumb/" + id;
 

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/ImagesAllFolderBrowser.java

@@ -101,7 +101,7 @@ public List<Item> browseItem(YaaccContentDirectory contentDirectory, String myId
                         MimeType mimeType = MimeType.valueOf(mImageCursor.getString(mImageCursor.getColumnIndex(MediaStore.Images.ImageColumns.MIME_TYPE)));
                         // file parameter only needed for media players which decide the
                         // ability of playing a file by the file extension
-                        String uri = getUriString(contentDirectory, id, mimeType);
+                        String uri = getUriString(contentDirectory, id, mimeType, name, null);
                         URI albumArtUri = URI.create("http://"
                                 + contentDirectory.getIpAddress() + ":"
                                 + YaaccUpnpServerService.PORT + "/thumb/" + id);

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/ImagesByBucketNameFolderBrowser.java

@@ -119,7 +119,7 @@ public List<Item> browseItem(YaaccContentDirectory contentDirectory, String myId
                         MimeType mimeType = MimeType.valueOf(mImageCursor.getString(mImageCursor.getColumnIndex(MediaStore.Images.ImageColumns.MIME_TYPE)));
                         // file parameter only needed for media players which decide the
                         // ability of playing a file by the file extension
-                        String uri = getUriString(contentDirectory, id, mimeType);
+                        String uri = getUriString(contentDirectory, id, mimeType, name, null);
                         String albumArtUri = "http://" + contentDirectory.getIpAddress() + ":"
                                 + YaaccUpnpServerService.PORT + "/thumb/" + id;
 

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/MusicAlbumFolderBrowser.java

@@ -196,7 +196,7 @@ public List<MusicTrack> browseItem(YaaccContentDirectory contentDirectory,
                                         .getColumnIndex(MediaStore.Audio.Media.MIME_TYPE)));
                         // file parameter only needed for media players which decide
                         // the ability of playing a file by the file extension
-                        String uri = getUriString(contentDirectory, id, mimeType);
+                        String uri = getUriString(contentDirectory, id, mimeType, title, null);
                         URI albumArtUri = URI.create("http://"
                                 + contentDirectory.getIpAddress() + ":"
                                 + YaaccUpnpServerService.PORT + "/album/" + albumId);

yaacc/src/main/java/de/yaacc/upnp/server/contentdirectory/MusicAlbumItemBrowser.java

@@ -131,7 +131,7 @@ public DIDLObject browseMeta(YaaccContentDirectory contentDirectory,
                 // file parameter only needed for media players which decide
                 // the ability of playing a file by the file extension
 
-                String uri = getUriString(contentDirectory, id, mimeType);
+                String uri = getUriString(contentDirectory, id, mimeType, title, null);
                 URI albumArtUri = URI.create("http://"
                         + contentDirectory.getIpAddress() + ":"
                         + YaaccUpnpServerService.PORT + "/album/" + albumId);