From 0ac76fbebc19003782ff9917156f8b6826d6afa3 Mon Sep 17 00:00:00 2001
From: AdeHub <ade_headphones@yahoo.co.uk>
Date: Sun, 3 Aug 2025 21:14:24 +1200
Subject: [PATCH] Blackhole folder issue

fixes #3388
---
 headphones/searcher.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/headphones/searcher.py b/headphones/searcher.py
index f47e1fa7..fbe616f9 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -127,23 +127,23 @@ def read_torrent_name(torrent_file, default_name=None):
         with open(torrent_file, "rb") as fp:
             torrent_info = bdecode(fp.read())
     except IOError as e:
-        logger.error("Unable to open torrent file: %s", torrent_file)
-        return
+        logger.error("Unable to open torrent file: %s. %s", torrent_file, e)
+        return default_name
 
-    # Read dictionary
-    if torrent_info:
-        try:
-            return torrent_info["info"]["name"]
-        except KeyError:
-            if default_name:
-                logger.warning("Couldn't get name from torrent file: %s. "
-                               "Defaulting to '%s'", e, default_name)
-            else:
-                logger.warning("Couldn't get name from torrent file: %s. No "
-                               "default given", e)
+    name = None
+    info = torrent_info.get(b'info')
+    if info:
+        raw_name = info.get(b'name')
+        if raw_name:
+            name = raw_name.decode(headphones.SYS_ENCODING, 'replace')
 
-    # Return default
-    return default_name
+    if not name:
+        if default_name:
+            logger.warning("Couldn't get name from torrent file: %s. Defaulting to '%s'", torrent_file, default_name)
+        else:
+            logger.warning("Couldn't get name from torrent file: %s. No default given", torrent_file)
+
+    return name or default_name
 
 
 def calculate_torrent_hash(link, data=None):
@@ -991,6 +991,8 @@ def send_to_downloader(data, result, album):
                             folder_name = read_torrent_name(
                                     download_path,
                                     result.title)
+                            if folder_name:
+                                logger.info('Torrent folder name: %s' % folder_name)
 
                             # Break for loop
                             break