From 05f66d40f36a9f0050e65817e3c390b6e613bbf4 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Sat, 26 Dec 2020 16:42:56 +0300
Subject: [PATCH 1/3] Show Album Art with UserNotification.

---
 Application/PlaybackEventController.m | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m
index 64f02741e..06c0e79a9 100644
--- a/Application/PlaybackEventController.m
+++ b/Application/PlaybackEventController.m
@@ -174,6 +174,32 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
                     content.sound = nil;
                     content.categoryIdentifier = @"play";
                     
+                    if ([defaults boolForKey:@"notifications.show-album-art"] && [pe albumArtInternal]) {
+                        NSError *error = nil;
+                        NSFileManager *fileManager = [NSFileManager defaultManager];
+                        NSString *tmpSubFolderName = [NSProcessInfo.processInfo globallyUniqueString];
+                        NSURL *tmpSubFolderURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()]
+                                URLByAppendingPathComponent:tmpSubFolderName isDirectory:true];
+                        if ([fileManager createDirectoryAtPath:[tmpSubFolderURL path]
+                                   withIntermediateDirectories:true
+                                                    attributes:nil
+                                                         error:&error]) {
+                            NSURL *fileURL = [tmpSubFolderURL URLByAppendingPathComponent:@"art.png"];
+                            NSImage *image = [pe albumArt];
+                            CGImageRef cgRef = [image CGImageForProposedRect:NULL context:nil hints:nil];
+                            NSBitmapImageRep *newRep = [[NSBitmapImageRep alloc] initWithCGImage:cgRef];
+                            [newRep setSize:[image size]];
+                            NSData *pngData = [newRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
+                            [pngData writeToURL:fileURL atomically:YES];
+
+                            UNNotificationAttachment *icon = [UNNotificationAttachment attachmentWithIdentifier:@"art"
+                                                                                                            URL:fileURL
+                                                                                                        options:nil
+                                                                                                          error:&error];
+                            content.attachments = @[icon];
+                        }
+                    }
+
                     UNNotificationRequest * request = [UNNotificationRequest requestWithIdentifier:@"PlayTrack" content:content trigger:nil];
                     
                     [center addNotificationRequest:request withCompletionHandler:^(NSError * _Nullable error) {

From bd4e64c029fa62754cb6dee3dc860c45dd35a775 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Sat, 26 Dec 2020 16:44:08 +0300
Subject: [PATCH 2/3] Do not show iTunes Style option with UserNotification.

---
 Preferences/General/Base.lproj/Preferences.xib | 9 +++++----
 Preferences/General/GeneralPreferencesPlugin.h | 2 ++
 Preferences/General/GeneralPreferencesPlugin.m | 9 +++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Preferences/General/Base.lproj/Preferences.xib b/Preferences/General/Base.lproj/Preferences.xib
index 2b9a6c667..59a8d00b3 100644
--- a/Preferences/General/Base.lproj/Preferences.xib
+++ b/Preferences/General/Base.lproj/Preferences.xib
@@ -11,6 +11,7 @@
                 <outlet property="appearanceView" destination="CgN-sy-RmM" id="wvB-aW-Gfx"/>
                 <outlet property="growlView" destination="U4w-jw-ca5" id="IUJ-gB-jwT"/>
                 <outlet property="hotKeyPane" destination="6" id="14"/>
+                <outlet property="iTunesStyleCheck" destination="AIz-WH-Wqk" id="2n1-pY-cZR"/>
                 <outlet property="midiPane" destination="i5B-ga-Atm" id="rbe-uK-5n2"/>
                 <outlet property="outputPane" destination="57" id="75"/>
                 <outlet property="playlistView" destination="231" id="244"/>
@@ -400,12 +401,12 @@
             <point key="canvasLocation" x="-78" y="-31.5"/>
         </customView>
         <customView id="U4w-jw-ca5" userLabel="GrowlView">
-            <rect key="frame" x="0.0" y="0.0" width="500" height="114"/>
+            <rect key="frame" x="0.0" y="0.0" width="500" height="94"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="njn-Xl-9k9">
-                    <rect key="frame" x="18" y="78" width="158" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
+                    <rect key="frame" x="18" y="58" width="158" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Enable notifications" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="hqT-nY-NoU">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -415,7 +416,7 @@
                     </connections>
                 </button>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AIz-WH-Wqk">
-                    <rect key="frame" x="18" y="58" width="131" height="18"/>
+                    <rect key="frame" x="18" y="18" width="131" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Use iTunes style" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="cOb-hQ-7K8">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
diff --git a/Preferences/General/GeneralPreferencesPlugin.h b/Preferences/General/GeneralPreferencesPlugin.h
index 15a5099ae..9b31123aa 100644
--- a/Preferences/General/GeneralPreferencesPlugin.h
+++ b/Preferences/General/GeneralPreferencesPlugin.h
@@ -25,6 +25,8 @@
     IBOutlet NSView *growlView;
     IBOutlet NSView *appearanceView;
     IBOutlet NSView *midiView;
+
+    __weak IBOutlet NSButton *iTunesStyleCheck;
 }
 
 - (HotKeyPane *)hotKeyPane;
diff --git a/Preferences/General/GeneralPreferencesPlugin.m b/Preferences/General/GeneralPreferencesPlugin.m
index 90d022cfc..ce2bf6058 100644
--- a/Preferences/General/GeneralPreferencesPlugin.m
+++ b/Preferences/General/GeneralPreferencesPlugin.m
@@ -71,6 +71,15 @@
 
 - (GeneralPreferencePane *)growlPane
 {
+    if (@available(macOS 10.14, *)) {
+        if (iTunesStyleCheck) {
+            iTunesStyleCheck.hidden = YES;
+            NSSize size = growlView.frame.size;
+            size.height -= 18;
+            [growlView setFrameSize:size];
+        }
+    }
+
     return [GeneralPreferencePane preferencePaneWithView:growlView title:NSLocalizedStringFromTableInBundle(@"Growl", nil, [NSBundle bundleForClass:[self class]], @"")  iconNamed:@"growl"];
 }
 

From e16d4e8aa781990d62f23dec4e1b0ba26b03ac6c Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Thu, 7 Jan 2021 08:45:44 +0300
Subject: [PATCH 3/3] Save artwork to jpg instead of png to reduce size.

---
 Application/PlaybackEventController.m | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m
index 06c0e79a9..e0c56a387 100644
--- a/Application/PlaybackEventController.m
+++ b/Application/PlaybackEventController.m
@@ -177,26 +177,31 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
                     if ([defaults boolForKey:@"notifications.show-album-art"] && [pe albumArtInternal]) {
                         NSError *error = nil;
                         NSFileManager *fileManager = [NSFileManager defaultManager];
-                        NSString *tmpSubFolderName = [NSProcessInfo.processInfo globallyUniqueString];
                         NSURL *tmpSubFolderURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()]
-                                URLByAppendingPathComponent:tmpSubFolderName isDirectory:true];
+                                URLByAppendingPathComponent:@"cog-artworks-cache" isDirectory:true];
                         if ([fileManager createDirectoryAtPath:[tmpSubFolderURL path]
                                    withIntermediateDirectories:true
                                                     attributes:nil
                                                          error:&error]) {
-                            NSURL *fileURL = [tmpSubFolderURL URLByAppendingPathComponent:@"art.png"];
+                            NSString *tmpFileName = [[NSProcessInfo.processInfo globallyUniqueString] stringByAppendingString:@".jpg"];
+                            NSURL *fileURL = [tmpSubFolderURL URLByAppendingPathComponent:tmpFileName];
                             NSImage *image = [pe albumArt];
                             CGImageRef cgRef = [image CGImageForProposedRect:NULL context:nil hints:nil];
                             NSBitmapImageRep *newRep = [[NSBitmapImageRep alloc] initWithCGImage:cgRef];
-                            [newRep setSize:[image size]];
-                            NSData *pngData = [newRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
-                            [pngData writeToURL:fileURL atomically:YES];
+                            NSData *jpgData = [newRep representationUsingType:NSBitmapImageFileTypeJPEG
+                                                                   properties:@{NSImageCompressionFactor: @0.5f}];
+                            [jpgData writeToURL:fileURL atomically:YES];
 
                             UNNotificationAttachment *icon = [UNNotificationAttachment attachmentWithIdentifier:@"art"
                                                                                                             URL:fileURL
                                                                                                         options:nil
                                                                                                           error:&error];
-                            content.attachments = @[icon];
+                            if (error) {
+                                // We have size limit of 10MB per image attachment.
+                                NSLog(@"%@", error.localizedDescription);
+                            } else {
+                                content.attachments = @[icon];
+                            }
                         }
                     }