Changeset 666 for trunk

Timestamp:

07/10/13 17:08:00 (11 years ago)

Author:

Nicholas Riley

Message:

StreamVision.py: Send all images to Growl as TIFF.

Previously we used whatever iTunes returned to us, which could be a
JPEG (no longer supported in current Growl versions), or a file path
(not supported with sandboxing).

​http://growl.info/documentation/applescript-support.php
​https://groups.google.com/forum/#!topic/growldiscuss/GbtPcpgSoNY

Thanks to Rudy Richter for the help.

File:

• trunk/StreamVision/StreamVision.py (modified) (4 diffs)

trunk/StreamVision/StreamVision.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
+from aem.ae import newdesc
 from appscript import app, k, its, CommandError
-from AppKit import NSApplication, NSApplicationDefined, NSBeep, NSSystemDefined, NSURL, NSWorkspace
-from Foundation import NSDistributedNotificationCenter, NSSearchPathForDirectoriesInDomains, NSCachesDirectory, NSUserDomainMask
+from AppKit import (NSApplication, NSApplicationDefined, NSBeep, NSImage,
+                    NSSystemDefined, NSURL, NSWorkspace)
+from Foundation import (NSDistributedNotificationCenter,
+                        NSSearchPathForDirectoriesInDomains,
+                        NSCachesDirectory, NSUserDomainMask)
 from PyObjCTools import AppHelper
 from Carbon.CarbonEvt import RegisterEventHotKey, GetApplicationEventTarget
 from Carbon.Events import cmdKey, shiftKey, controlKey
-from AudioDevice import default_output_device_is_airplay, set_default_output_device_changed_callback
+from AudioDevice import (default_output_device_is_airplay,
+                         set_default_output_device_changed_callback)
 import httplib2
 import os
@@ -41 +46 @@
         if usingStereo:
             description += '\n(AirPlay)'
+
+        if 'image' in kw:
+            image = (NSImage.alloc().initWithData_(buffer(kw['image']))
+                     .TIFFRepresentation())
+            kw['image'] = newdesc('TIFF', image)
 
         growl.notify(
@@ -212 +222 @@
                 else:
                     if response['content-type'].startswith('image/'):
-                        file(self.imagePath, 'w').write(content)
-                        kw['image_from_location'] = self.imagePath
+                        kw['image'] = content
             growlNotify(cleanStreamTitle(iTunes.current_stream_title()),
                         cleanStreamTrackName(trackName), **kw)
@@ -226 +235 @@
             if artwork:
                 try:
-                    kw['pictImage'] = artwork[0].data_()
+                    kw['image'] = artwork[0].data_().data
                 except CommandError:
                     pass