From 3a193346eeb27ac2959ff30c370adb899ec94732 Mon Sep 17 00:00:00 2001
From: Eric Lammerts <eric@lammerts.org>
Date: Mon, 7 Oct 2024 19:17:55 -0400
Subject: [PATCH] [pp/XAttrMetadata] Try to write each attribute (#11115)

Authored by: eric321
---
 yt_dlp/postprocessor/xattrpp.py | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/yt_dlp/postprocessor/xattrpp.py b/yt_dlp/postprocessor/xattrpp.py
index f822eff41..166aabaf9 100644
--- a/yt_dlp/postprocessor/xattrpp.py
+++ b/yt_dlp/postprocessor/xattrpp.py
@@ -26,38 +26,40 @@ class XAttrMetadataPP(PostProcessor):
 
     XATTR_MAPPING = {
         'user.xdg.referrer.url': 'webpage_url',
-        # 'user.xdg.comment': 'description',
         'user.dublincore.title': 'title',
         'user.dublincore.date': 'upload_date',
-        'user.dublincore.description': 'description',
         'user.dublincore.contributor': 'uploader',
         'user.dublincore.format': 'format',
+        # We do this last because it may get us close to the xattr limits
+        # (e.g., 4kB on ext4), and we don't want to have the other ones fail
+        'user.dublincore.description': 'description',
+        # 'user.xdg.comment': 'description',
     }
 
     def run(self, info):
         mtime = os.stat(info['filepath']).st_mtime
         self.to_screen('Writing metadata to file\'s xattrs')
-        try:
-            for xattrname, infoname in self.XATTR_MAPPING.items():
+        for xattrname, infoname in self.XATTR_MAPPING.items():
+            try:
                 value = info.get(infoname)
                 if value:
                     if infoname == 'upload_date':
                         value = hyphenate_date(value)
                     write_xattr(info['filepath'], xattrname, value.encode())
 
-        except XAttrUnavailableError as e:
-            raise PostProcessingError(str(e))
-        except XAttrMetadataError as e:
-            if e.reason == 'NO_SPACE':
-                self.report_warning(
-                    'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. '
-                    'Some extended attributes are not written')
-            elif e.reason == 'VALUE_TOO_LONG':
-                self.report_warning('Unable to write extended attributes due to too long values.')
-            else:
-                tip = ('You need to use NTFS' if compat_os_name == 'nt'
-                       else 'You may have to enable them in your "/etc/fstab"')
-                raise PostProcessingError(f'This filesystem doesn\'t support extended attributes. {tip}')
+            except XAttrUnavailableError as e:
+                raise PostProcessingError(str(e))
+            except XAttrMetadataError as e:
+                if e.reason == 'NO_SPACE':
+                    self.report_warning(
+                        'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. '
+                        f'Extended attribute "{xattrname}" was not written.')
+                elif e.reason == 'VALUE_TOO_LONG':
+                    self.report_warning(f'Unable to write extended attribute "{xattrname}" due to too long values.')
+                else:
+                    tip = ('You need to use NTFS' if compat_os_name == 'nt'
+                           else 'You may have to enable them in your "/etc/fstab"')
+                    raise PostProcessingError(f'This filesystem doesn\'t support extended attributes. {tip}')
 
         self.try_utime(info['filepath'], mtime, mtime)
         return [], info