Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 12

pulseaudio-dlna.changes Changed

@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Sun Nov 22 12:01:14 UTC 2015 - antoine.belvire@laposte.net
+
+- Update to 0.4.7:
+  * The application can now co-exist with other applications which
+    are using the port 1900/udp (thanks to klaernie)
+  * Fix the daemon mode to support psutil 1.x and 2.x (thanks to
+    klaernie)
+  * HTML entities in device descriptions are now converted
+    automatically
+  * Faster and more reliable device discovery (new dependency
+    python-netifaces)
+  * Add the --cover-mode option, one mode requires (optional)
+    dependencies gtk, cairo, rsvg
+  * L16 codecs are now selected better (e.g. needed for XBox 360)
+  * Fix a bug where sometimes it was tried to remove sinks twice
+    on cleanup
+  * Add the --update-device-config flag
+  * Add the --ssdp-ttl, --ssdp-mx, --ssdp-amount options
+  * Add the --msearch-port option
+
+-------------------------------------------------------------------
 Fri Oct 23 21:00:31 UTC 2015 - antoine.belvire@laposte.net
 
 - Update to 0.4.6:

pulseaudio-dlna.spec Changed

pulseaudio-dlna-0.4.6.tar.gz/Makefile -> pulseaudio-dlna-0.4.7.tar.gz/Makefile Changed

pulseaudio-dlna-0.4.6.tar.gz/README.md -> pulseaudio-dlna-0.4.7.tar.gz/README.md Changed

@@ -1,8 +1,7 @@
 # About #
-
-This is _pulseaudio-dlna_. A small DLNA server which brings DLNA / UPNP
+<img align="left" src="samples/images/application.png">
+This is _pulseaudio-dlna_. A lightweight streaming server which brings DLNA / UPNP
 and Chromecast support to PulseAudio and Linux.
-
 It can stream your current PulseAudio playback to different UPNP devices
 (UPNP Media Renderers) or Chromecasts in your network.
 It's main goals are: easy to use, no configuration hassle, no
@@ -36,6 +35,18 @@
 
 ## Changelog ##
 
+ * __0.4.7__ - (_2015-11-18_)
+ - The application can now co-exist with other applications which are using the port 1900/udp (thanks to [klaernie](https://github.com/klaernie))
+ - Fixed the daemon mode to support `psutil` 1.x and 2.x (thanks to [klaernie](https://github.com/klaernie))
+ - HTML entities in device descriptions are now converted automatically
+ - Faster and more reliable device discovery (new dependency `python-netifaces`)
+ - Added the `--cover-mode` option, one mode requires (optional) dependencies `gtk`, `cairo`, `rsvg`
+ - L16 codecs are now selected better (e.g. needed for _XBox 360_)
+ - Fixed a bug where sometimes it was tried to remove sinks twice on cleanup
+ - Added the `--update-device-config` flag
+ - Added the `--ssdp-ttl`, `--ssdp-mx`, `--ssdp-amount` options
+ - Added the `--msearch-port` option
+
 * __0.4.6__ - (_2015-10-17_)
 - Added support for _Google Chromecast Audio_ (thanks to [leonhandreke](https://github.com/leonhandreke))
 - Fixed a bug where devices which does not specifiy control urls made the application crash
@@ -151,6 +162,7 @@
 ## Installation via PPA ##
 
 Supported Ubuntu releases:
+- 15.10 (Wily Werewolf)
 - 15.04 (Vivid Vervet)
 - 14.04.2 LTS (Trusty Tahr)
 
@@ -205,6 +217,7 @@
 - python-psutil
 - python-concurrent.futures
 - python-chardet
+- python-netifaces
 - vorbis-tools
 - sox
 - lame
@@ -214,7 +227,7 @@
 
 You can install all the dependencies in Ubuntu via:
 
- sudo apt-get install python2.7 python-pip python-setuptools python-dbus python-beautifulsoup python-docopt python-requests python-setproctitle python-gobject python-protobuf python-notify2 python-psutil python-concurrent.futures python-chardet vorbis-tools sox lame flac faac opus-tools
+ sudo apt-get install python2.7 python-pip python-setuptools python-dbus python-beautifulsoup python-docopt python-requests python-setproctitle python-gobject python-protobuf python-notify2 python-psutil python-concurrent.futures python-chardet python-netifaces vorbis-tools sox lame flac faac opus-tools
 
 ### PulseAudio DBus module ###
 
@@ -305,8 +318,17 @@
 ### CLI ###
 
 Usage:
- pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoders>] [--bit-rate=<rate>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--request-timeout <timeout>] [--debug] [--fake-http10-content-length] [--fake-http-content-length] [--disable-switchback] [--disable-ssdp-listener] [--disable-device-stop]
- pulseaudio-dlna [--create-device-config]
+ pulseaudio-dlna [--host <host>] [--port <port>][--encoder <encoders>] [--bit-rate=<rate>]
+ [--filter-device=<filter-device>]
+ [--renderer-urls <urls>]
+ [--request-timeout <timeout>]
+ [--msearch-port=<msearch-port>] [--ssdp-mx <ssdp-mx>] [--ssdp-ttl <ssdp-ttl>] [--ssdp-amount <ssdp-amount>]
+ [--cover-mode <mode>]
+ [--debug]
+ [--fake-http10-content-length] [--fake-http-content-length]
+ [--disable-switchback] [--disable-ssdp-listener] [--disable-device-stop]
+ pulseaudio-dlna [--host <host>] [--create-device-config] [--update-device-config]
+ [--msearch-port=<msearch-port>] [--ssdp-mx <ssdp-mx>] [--ssdp-ttl <ssdp-ttl>] [--ssdp-amount <ssdp-amount>]
 pulseaudio-dlna [-h | --help | --version]
 
 Options:
@@ -318,6 +340,7 @@
 - Various codec settings such as the mime type, specific rules or
 the bit rate (depends on the codec)
 A written config is loaded by default if the --encoder and --bit-rate options are not used.
+ --update-device-config Same as --create-device-config but preserves your existing config from being overwritten
 --host=<host> Set the server ip.
 -p --port=<port> Set the server port [default: 8080].
 -e --encoder=<encoders> Set the audio encoder.
@@ -335,6 +358,16 @@
 filter text will be skipped.
 --renderer-urls=<urls> Set the renderer urls yourself. no discovery will commence.
 --request-timeout=<timeout> Set the timeout for requests in seconds [default: 10].
+ --ssdp-ttl=<ssdp-ttl> Set the SSDP socket's TTL [default: 10].
+ --ssdp-mx=<ssdp-mx> Set the MX value of the SSDP discovery message [default: 3].
+ --ssdp-amount=<ssdp-amount> Set the amount of SSDP discovery messages being sent [default: 5].
+ --msearch-port=<msearch-port> Set the source port of the MSEARCH socket [default: random].
+ --cover-mode=<mode> Set the cover mode [default: default].
+ Possible modes are:
+ - disabled No icon is shown
+ - default The application icon is shown
+ - distribution The icon of your distribution is shown
+ - application The audio application's icon is shown
 --debug enables detailed debug messages.
 --fake-http-content-length If set, the content-length of HTTP requests will be set to 100 GB.
 --disable-switchback If set, streams won't switched back to the default sink if a device disconnects.
@@ -533,15 +566,35 @@
 
 ## Troubleshooting ##
 
-Some devices do not stick to the HTTP 1.0/1.1 standard. Since most devices do,
-_pulseaudio-dlna_ must be instructed by CLI flags to act in a non-standard way.
+- **My device does not get discovered by _pulseaudio-dlna_**
+
+ The computer _pulseaudio-dlna_ is running on and your device needs to be in
+ the same network. In uncomplicated home LANs this is normally the case.
+ You can test if other applications are able to find your device,
+ e.g. _BubbleUPnP_ (_Android_ application). If they do it is likely that
+ you are using a firewall / iptables. Try disabling it. If you verified that
+ your firewall is blocking, you should use the `--msearch-port <port>`
+ option and open port 8080/_tcp_, port 1900/_udp_ and port `<port>`/_udp_.
+
+- **The device is successfully instructed to play, but the device never
+ connects to _pulseaudio-dlna_**
 
-- `--fake-http-content-length`
+ Check if your are using a firewall / iptables. If that works, open
+ port 8080/_tcp_ and port 1900/_udp_.
 
- Adds a faked HTTP Content-Length to HTTP 1.0/1.1 responses. The length is set 
- to 100 GB and ensures that the device would keep playing for months.
- This is e.g. necessary for the _Hame Soundrouter_ and depending on the used
- encoder for _Sonos_ devices.
+- **The device is successfully instructed to play, but the device immediately
+ disconnects after some seconds**
+
+ Some devices do not stick to the HTTP 1.0/1.1 standard. Since most devices
+ do, _pulseaudio-dlna_ must be instructed by CLI flags to act in a
+ non-standard way.
+
+ - `--fake-http-content-length`
+
+ Adds a faked HTTP Content-Length to HTTP 1.0/1.1 responses. The length
+ is set to 100 GB and ensures that the device would keep playing for
+ months. This is e.g. necessary for the _Hame Soundrouter_ and depending
+ on the used encoder for _Sonos_ devices.
 
 ## Tested devices ##
 
@@ -552,6 +605,7 @@
 ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | -------------
 D-Link DCH-M225/E | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign:
 [Cocy UPNP media renderer](https://github.com/mnlipp/CoCy) | :white_check_mark: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign:
+[gmrender-resurrect](http://github.com/hzeller/gmrender-resurrect) | :white_check_mark: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 BubbleUPnP (Android App) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :white_check_mark:
 Samsung Smart TV LED60 (UE60F6300) | :white_check_mark: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 Samsung Smart TV LED40 (UE40ES6100) | :white_check_mark: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
@@ -559,6 +613,7 @@
 Xbmc / Kodi | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :white_circle:2 | :white_circle:2 | :white_check_mark:
 Philips Streamium NP2500 Network Player | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 Yamaha RX-475 (AV Receiver) | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
+Yamaha RX-V573 (AV Receiver) 6 | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 Majik DSM | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 [Pi MusicBox](http://www.woutervanwijk.nl/pimusicbox/) | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 Google Chromecast | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign:
@@ -581,6 +636,7 @@
 Denon AVR-3808 | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 DAMAI Airmusic | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
 Panasonic TX-50CX680W | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question: | :grey_question:
+Xbox 360 | :white_check_mark:5 | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :grey_question: | :no_entry_sign: | :white_check_mark:
 
 1) Works when specifing the `--fake-http-content-length` flag
 
@@ -590,6 +646,10 @@
 
 4) The device needs to be in _SERVER_ mode to accept instructions
 
+5) Was reported to buffer really long. Approximately 45 seconds
+
+6) Was reported to have issues being discovered. Make sure you run the latest firmware
+
 ## Supported encoders ##
 
 Encoder | Description | Identifier

pulseaudio-dlna-0.4.6.tar.gz/debian/changelog -> pulseaudio-dlna-0.4.7.tar.gz/debian/changelog Changed

pulseaudio-dlna-0.4.6.tar.gz/debian/control -> pulseaudio-dlna-0.4.7.tar.gz/debian/control Changed

@@ -29,6 +29,7 @@
          python-psutil (>=1.2.1),
          python-concurrent.futures (>=2.1.6),
          python-chardet (>=2.0.1),
+         python-netifaces (>=0.8),
          vorbis-tools (>=1.4.0),
          sox (>=14.4.1),
          lame (>=3.99.0),
@@ -36,9 +37,13 @@
          faac (>=1.28),
          opus-tools (>=0.1.8),
          ${misc:Depends}
+Suggests: python-cairo (>=1.8.8),
+          python-rsvg (>=2.32.0),
+          python-gtk2 (>=2.24.0),
 Homepage: https://github.com/masmu/pulseaudio-dlna
-Description: A small DLNA server which brings DLNA / UPNP support to
- PulseAudio and Linux.
- It can stream your current PulseAudio playback to different UPNP
- devices (UPNP Media Renderers) in your network. It's main goals are:
+Description: Stream audio to DLNA devices and Chromecasts
+ Creates Pulseaudio sinks for DLNA devices or Chromecasts in your network
+ and streams the current playback to those.
+ .
+ It's main goals are:
  easy to use, no configuration hassle, no big dependencies.

pulseaudio-dlna-0.4.6.tar.gz/debian/pulseaudio-dlna.1 -> pulseaudio-dlna-0.4.7.tar.gz/debian/pulseaudio-dlna.1 Changed

@@ -1,14 +1,23 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1.
-.TH PULSEAUDIO-DLNA "1" "October 2015" "pulseaudio-dlna 0.4.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.2.
+.TH PULSEAUDIO-DLNA "1" "November 2015" "pulseaudio-dlna 0.4.7" "User Commands"
 .SH NAME
-pulseaudio-dlna \- manual page for pulseaudio-dlna 0.4.6
+pulseaudio-dlna \- Stream audio to DLNA devices and Chromecasts
 .SH DESCRIPTION
 .SS "Usage:"
 .TP
-pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>] [\-\-encoder <encoders>] [\-\-bit\-rate=<rate>] [\-\-filter\-device=<filter\-device>] [\-\-renderer\-urls <urls>]
-[\-\-request\-timeout <timeout>] [\-\-debug] [\-\-fake\-http10\-content\-length] [\-\-fake\-http\-content\-length] [\-\-disable\-switchback] [\-\-disable\-ssdp\-listener] [\-\-disable\-device\-stop]
+pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>][\-\-encoder <encoders>] [\-\-bit\-rate=<rate>]
+[\-\-filter\-device=<filter\-device>]
+[\-\-renderer\-urls <urls>]
+[\-\-request\-timeout <timeout>]
+[\-\-msearch\-port=<msearch\-port>] [\-\-ssdp\-mx <ssdp\-mx>] [\-\-ssdp\-ttl <ssdp\-ttl>] [\-\-ssdp\-amount <ssdp\-amount>]
+[\-\-cover\-mode <mode>]
+[\-\-debug]
+[\-\-fake\-http10\-content\-length] [\-\-fake\-http\-content\-length]
+[\-\-disable\-switchback] [\-\-disable\-ssdp\-listener] [\-\-disable\-device\-stop]
+.TP
+pulseaudio\-dlna [\-\-host <host>] [\-\-create\-device\-config] [\-\-update\-device\-config]
+[\-\-msearch\-port=<msearch\-port>] [\-\-ssdp\-mx <ssdp\-mx>] [\-\-ssdp\-ttl <ssdp\-ttl>] [\-\-ssdp\-amount <ssdp\-amount>]
 .IP
-pulseaudio\-dlna [\-\-create\-device\-config]
 pulseaudio\-dlna [\-h | \fB\-\-help\fR | \fB\-\-version]\fR
 .SH OPTIONS
 .TP
@@ -16,15 +25,17 @@
 Discovers all devices in your network and write a config for them.
 That config can be editied manually to adjust various settings.
 You can set:
-.IP
+.TP
 \- Device name
 \- Codec order (The first one is used if the encoder binary is available on your system)
 \- Various codec settings such as the mime type, specific rules or
-.IP
+.TP
 the bit rate (depends on the codec)
-.IP
 A written config is loaded by default if the \fB\-\-encoder\fR and \fB\-\-bit\-rate\fR options are not used.
 .TP
+\fB\-\-update\-device\-config\fR
+Same as \fB\-\-create\-device\-config\fR but preserves your existing config from being overwritten
+.TP
 \fB\-\-host=\fR<host>
 Set the server ip.
 .TP
@@ -70,6 +81,34 @@
 \fB\-\-request\-timeout=\fR<timeout>
 Set the timeout for requests in seconds [default: 10].
 .TP
+\fB\-\-ssdp\-ttl=\fR<ssdp\-ttl>
+Set the SSDP socket's TTL [default: 10].
+.TP
+\fB\-\-ssdp\-mx=\fR<ssdp\-mx>
+Set the MX value of the SSDP discovery message [default: 3].
+.TP
+\fB\-\-ssdp\-amount=\fR<ssdp\-amount>
+Set the amount of SSDP discovery messages being sent [default: 5].
+.TP
+\fB\-\-msearch\-port=\fR<msearch\-port>
+Set the source port of the MSEARCH socket [default: random].
+.TP
+\fB\-\-cover\-mode=\fR<mode>
+Set the cover mode [default: default].
+Possible modes are:
+.TP
+\- disabled
+No icon is shown
+.TP
+\- default
+The application icon is shown
+.TP
+\- distribution
+The icon of your distribution is shown
+.TP
+\- application
+The audio application's icon is shown
+.TP
 \fB\-\-debug\fR
 enables detailed debug messages.
 .TP

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/__init__.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/__init__.py Changed

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/__main__.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/__main__.py Changed

@@ -17,8 +17,17 @@
 
 '''
 Usage:
- pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoders>] [--bit-rate=<rate>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--request-timeout <timeout>] [--debug] [--fake-http10-content-length] [--fake-http-content-length] [--disable-switchback] [--disable-ssdp-listener] [--disable-device-stop]
- pulseaudio-dlna [--create-device-config]
+ pulseaudio-dlna [--host <host>] [--port <port>][--encoder <encoders>] [--bit-rate=<rate>]
+ [--filter-device=<filter-device>]
+ [--renderer-urls <urls>]
+ [--request-timeout <timeout>]
+ [--msearch-port=<msearch-port>] [--ssdp-mx <ssdp-mx>] [--ssdp-ttl <ssdp-ttl>] [--ssdp-amount <ssdp-amount>]
+ [--cover-mode <mode>]
+ [--debug]
+ [--fake-http10-content-length] [--fake-http-content-length]
+ [--disable-switchback] [--disable-ssdp-listener] [--disable-device-stop]
+ pulseaudio-dlna [--host <host>] [--create-device-config] [--update-device-config]
+ [--msearch-port=<msearch-port>] [--ssdp-mx <ssdp-mx>] [--ssdp-ttl <ssdp-ttl>] [--ssdp-amount <ssdp-amount>]
 pulseaudio-dlna [-h | --help | --version]
 
 Options:
@@ -30,6 +39,7 @@
 - Various codec settings such as the mime type, specific rules or
 the bit rate (depends on the codec)
 A written config is loaded by default if the --encoder and --bit-rate options are not used.
+ --update-device-config Same as --create-device-config but preserves your existing config from being overwritten
 --host=<host> Set the server ip.
 -p --port=<port> Set the server port [default: 8080].
 -e --encoder=<encoders> Set the audio encoder.
@@ -47,6 +57,16 @@
 filter text will be skipped.
 --renderer-urls=<urls> Set the renderer urls yourself. no discovery will commence.
 --request-timeout=<timeout> Set the timeout for requests in seconds [default: 10].
+ --ssdp-ttl=<ssdp-ttl> Set the SSDP socket's TTL [default: 10].
+ --ssdp-mx=<ssdp-mx> Set the MX value of the SSDP discovery message [default: 3].
+ --ssdp-amount=<ssdp-amount> Set the amount of SSDP discovery messages being sent [default: 5].
+ --msearch-port=<msearch-port> Set the source port of the MSEARCH socket [default: random].
+ --cover-mode=<mode> Set the cover mode [default: default].
+ Possible modes are:
+ - disabled No icon is shown
+ - default The application icon is shown
+ - distribution The icon of your distribution is shown
+ - application The audio application's icon is shown
 --debug enables detailed debug messages.
 --fake-http-content-length If set, the content-length of HTTP requests will be set to 100 GB.
 --disable-switchback If set, streams won't switched back to the default sink if a device disconnects.

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/application.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/application.py Changed

@@ -31,10 +31,13 @@
 import pulseaudio_dlna.plugins.upnp
 import pulseaudio_dlna.plugins.chromecast
 import pulseaudio_dlna.encoders
+import pulseaudio_dlna.covermodes
 import pulseaudio_dlna.streamserver
 import pulseaudio_dlna.pulseaudio
 import pulseaudio_dlna.utils.network
 import pulseaudio_dlna.rules
+import pulseaudio_dlna.renderers
+import pulseaudio_dlna.discover
 
 logger = logging.getLogger('pulseaudio_dlna.application')
 
@@ -86,10 +89,32 @@
         logger.info('Using localhost: {host}:{port}'.format(
             host=host, port=port))
 
+        if options['--ssdp-ttl']:
+            ssdp_ttl = int(options['--ssdp-ttl'])
+            pulseaudio_dlna.discover.RendererDiscover.SSDP_TTL = ssdp_ttl
+            pulseaudio_dlna.listener.SSDPListener.SSDP_TTL = ssdp_ttl
+
+        if options['--ssdp-mx']:
+            ssdp_mx = int(options['--ssdp-mx'])
+            pulseaudio_dlna.discover.RendererDiscover.SSDP_MX = ssdp_mx
+
+        if options['--ssdp-amount']:
+            ssdp_amount = int(options['--ssdp-amount'])
+            pulseaudio_dlna.discover.RendererDiscover.SSDP_AMOUNT = ssdp_amount
+
+        msearch_port = options.get('--msearch-port', None)
+        if msearch_port != 'random':
+            pulseaudio_dlna.discover.RendererDiscover.MSEARCH_PORT = \
+                int(msearch_port)
+
         if options['--create-device-config']:
             self.create_device_config()
             sys.exit(0)
 
+        if options['--update-device-config']:
+            self.create_device_config(update=True)
+            sys.exit(0)
+
         device_config = None
         if not options['--encoder'] and not options['--bit-rate']:
             device_config = self.read_device_config()
@@ -130,6 +155,12 @@
                                 )))
                         sys.exit(0)
 
+        cover_mode = options['--cover-mode']
+        if cover_mode not in pulseaudio_dlna.covermodes.MODES:
+            logger.info('You specified an unknown cover mode! '
+                        'Application terminates.')
+            sys.exit(1)
+
         logger.info('Encoder settings:')
         for _type in pulseaudio_dlna.encoders.ENCODERS:
             _type.AVAILABLE = False
@@ -184,6 +215,7 @@
             bridges, message_queue,
             disable_switchback=disable_switchback,
             disable_device_stop=disable_device_stop,
+            cover_mode=cover_mode,
         )
 
         device_filter = None
@@ -191,8 +223,10 @@
             device_filter = options['--filter-device'].split(',')
 
         locations = None
+        disable_ssdp_search = False
         if options['--renderer-urls']:
             locations = options['--renderer-urls'].split(',')
+            disable_ssdp_search = True
 
         if options['--request-timeout']:
             request_timeout = float(options['--request-timeout'])
@@ -200,11 +234,19 @@
                 pulseaudio_dlna.plugins.renderer.BaseRenderer.REQUEST_TIMEOUT = \
                     request_timeout
 
+        holder = pulseaudio_dlna.renderers.RendererHolder(
+            self.PLUGINS, stream_server.ip, stream_server.port, message_queue,
+            device_filter, device_config)
+
+        if locations:
+            holder.process_locations(locations)
+
         try:
-            stream_server_address = stream_server.ip, stream_server.port
             ssdp_listener = pulseaudio_dlna.listener.ThreadedSSDPListener(
-                stream_server_address, message_queue, self.PLUGINS,
-                device_filter, device_config, locations, disable_ssdp_listener)
+                holder,
+                disable_ssdp_listener=disable_ssdp_listener,
+                disable_ssdp_search=disable_ssdp_search
+            )
         except socket.error:
             logger.error(
                 'The SSDP listener could not bind to the port 1900/UDP. '
@@ -225,9 +267,8 @@
         for process in self.processes:
             process.join()
 
-    def create_device_config(self):
-        holder = pulseaudio_dlna.renderers.RendererHolder(
-            ('', 0), multiprocessing.Queue(), self.PLUGINS)
+    def create_device_config(self, update=False):
+        holder = pulseaudio_dlna.renderers.RendererHolder(self.PLUGINS)
         discover = pulseaudio_dlna.discover.RendererDiscover(holder)
         discover.search()
 
@@ -241,10 +282,16 @@
             json_text = json.dumps(obj, default=device_filter)
             return json.loads(json_text)
 
-        existing_config = self.read_device_config()
-        if existing_config:
-            new_config = obj_to_dict(holder.renderers)
-            new_config.update(existing_config)
+        if update:
+            existing_config = self.read_device_config()
+            if existing_config:
+                new_config = obj_to_dict(holder.renderers)
+                new_config.update(existing_config)
+            else:
+                logger.error(
+                    'Your device config could not be found at any of the '
+                    'locations "{}"'.format(','.join(self.DEVICE_CONFIG_PATHS)))
+                sys.exit(1)
         else:
             new_config = obj_to_dict(holder.renderers)
         json_text = json.dumps(new_config, indent=4)

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/covermodes.py Added

@@ -0,0 +1,117 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import sys
+import inspect
+import socket
+import platform
+import logging
+
+logger = logging.getLogger('pulseaudio_dlna.covermodes')
+
+
+MODES = {}
+
+
+class BaseCoverMode(object):
+
+ IDENTIFIER = None
+
+ def __init__(self):
+ self.bridge = None
+
+ @property
+ def artist(self):
+ return 'Liveaudio on {}'.format(socket.gethostname())
+
+ @property
+ def title(self):
+ return ', '.join(self.bridge.sink.stream_client_names)
+
+ @property
+ def thumb(self):
+ return None
+
+ def get(self, bridge):
+ try:
+ self.bridge = bridge
+ return self.artist, self.title, self.thumb
+ finally:
+ self.bridge = None
+
+
+class DisabledCoverMode(BaseCoverMode):
+
+ IDENTIFIER = 'disabled'
+
+
+class DefaultCoverMode(BaseCoverMode):
+
+ IDENTIFIER = 'default'
+
+ @property
+ def thumb(self):
+ return self.bridge.device.get_image_url('default.png')
+
+
+class DistributionCoverMode(BaseCoverMode):
+
+ IDENTIFIER = 'distribution'
+
+ @property
+ def thumb(self):
+ dist_name, dist_ver, dist_arch = platform.linux_distribution()
+ logger.debug(dist_name)
+ if dist_name == 'Ubuntu':
+ dist_icon = 'ubuntu'
+ elif dist_name == 'debian':
+ dist_icon = 'debian'
+ elif dist_name == 'fedora':
+ dist_icon = 'fedora'
+ elif dist_name == 'LinuxMint':
+ dist_icon = 'linuxmint'
+ elif dist_name == 'openSUSE' or dist_name == 'SuSE':
+ dist_icon = 'opensuse'
+ elif dist_name == 'gentoo':
+ dist_icon = 'gentoo'
+ else:
+ dist_icon = 'unknown'
+ return self.bridge.device.get_image_url(
+ 'distribution-{}.png'.format(dist_icon))
+
+
+class ApplicationCoverMode(BaseCoverMode):
+
+ IDENTIFIER = 'application'
+
+ @property
+ def thumb(self):
+ return self.bridge.device.get_sys_icon_url(
+ self.bridge.sink.primary_application_name)
+
+
+def load_modes():
+ if len(MODES) == 0:
+ for name, _type in inspect.getmembers(sys.modules[__name__]):
+ if inspect.isclass(_type) and issubclass(_type, BaseCoverMode):
+ if _type is not BaseCoverMode:
+ MODES[_type.IDENTIFIER] = _type
+ return None
+
+load_modes()

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/daemon.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/daemon.py Changed

@@ -22,13 +22,14 @@
 import logging
 import os
 import sys
-import psutil
 import gobject
 import setproctitle
 import functools
 import signal
+import pwd
 
 import pulseaudio_dlna.utils.subprocess
+import pulseaudio_dlna.utils.psutil as psutil
 
 logger = logging.getLogger('pulseaudio_dlna.daemon')
 
@@ -85,7 +86,7 @@
             logger.info('Removing pulseaudio process ({})'.format(proc.pid))
             self.processes.remove(proc)
         for proc in alive:
-            if not proc.is_attached:
+            if not proc.is_attached and not proc.disabled:
                 proc.attach()
 
         self.is_checking = False
@@ -100,9 +101,14 @@
 
 @functools.total_ordering
 class PulseAudioProcess(psutil.Process):
+
+    DISPLAY_MANAGERS = ['gdm', 'lightdm', 'kdm', None]
+    UID_MIN = 500
+
     def __init__(self, *args, **kwargs):
         psutil.Process.__init__(*args, **kwargs)
         self.application = None
+        self.disabled = False
 
     @property
     def env(self):
@@ -110,11 +116,11 @@
 
     @property
     def uid(self):
-        return self.uids[0]
+        return self.uids()[0]
 
     @property
     def gid(self):
-        return self.gids[0]
+        return self.gids()[0]
 
     @property
     def is_attached(self):
@@ -124,6 +130,13 @@
         return False
 
     def attach(self):
+
+        if not self._is_pulseaudio_user_process():
+            self.disabled = True
+            logger.info('Ignoring pulseaudio process ({pid})!'.format(
+                pid=self.pid))
+            return
+
         logger.info('Attaching application to pulseaudio ({pid})'.format(
             pid=self.pid))
 
@@ -138,19 +151,27 @@
             'DISPLAY',
             'DBUS_SESSION_BUS_ADDRESS',
             'PATH',
-            'XDG_RUNTIME_DIR'
+            'XDG_RUNTIME_DIR',
+            'LANG'
         ]
         compressed_env = {}
         for k in required_variables:
             compressed_env[k] = proc_env[k]
 
-        self.application = (
-            pulseaudio_dlna.utils.subprocess.GobjectSubprocess(
-                sys.argv,
-                uid=self.uid,
-                gid=self.gid,
-                env=compressed_env,
-                cwd=os.getcwd()))
+        try:
+            self.application = (
+                pulseaudio_dlna.utils.subprocess.GobjectSubprocess(
+                    sys.argv,
+                    uid=self.uid,
+                    gid=self.gid,
+                    env=compressed_env,
+                    cwd=os.getcwd()))
+        except OSError as e:
+            self.application = None
+            self.disabled = True
+            logger.error(
+                'Could not attach to pulseaudio ({pid}) - {msg}!'.format(
+                    pid=self.pid, msg=e))
 
     def detach(self):
         app_pid = self.application.pid
@@ -161,6 +182,10 @@
             self._kill_process_tree(app_pid)
             self.application = None
 
+    def _is_pulseaudio_user_process(self):
+        return (self.uid >= self.UID_MIN and
+                self._get_uid_name(self.uid) not in self.DISPLAY_MANAGERS)
+
     def _kill_process_tree(self, pid, timeout=3):
         try:
             p = psutil.Process(pid)
@@ -168,13 +193,19 @@
                 self._kill_process_tree(child.pid)
             p.send_signal(signal.SIGINT)
             p.wait(timeout=timeout)
-        except psutil._error.TimeoutExpired:
+        except psutil.TimeoutExpired:
             logger.info(
                 'Process {} did not exit, sending SIGKILL ...'.format(pid))
             p.kill()
-        except psutil._error.NoSuchProcess:
+        except psutil.NoSuchProcess:
             logger.info('Process {} has exited.'.format(pid))
 
+    def _get_uid_name(self, uid):
+        try:
+            return pwd.getpwuid(uid).pw_name
+        except KeyError:
+            return None
+
     def _get_proc_env(self, pid):
         env = {}
         location = '/proc/{pid}/environ'.format(pid=pid)
@@ -204,11 +235,13 @@
         processes = []
         try:
             for proc in psutil.process_iter():
-                if proc.name == 'pulseaudio':
+                if proc.name() == 'pulseaudio':
                     proc.__class__ = PulseAudioProcess
                     if not hasattr(proc, 'application'):
                         proc.application = None
+                    if not hasattr(proc, 'disabled'):
+                        proc.disabled = False
                     processes.append(proc)
-        except psutil._error.NoSuchProcess:
+        except psutil.NoSuchProcess:
             pass
         return processes

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/discover.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/discover.py Changed

@@ -17,56 +17,102 @@
 
 from __future__ import unicode_literals
 
-import socket as s
+import socket
 import logging
-import time
 import chardet
+import threading
+
+import pulseaudio_dlna.utils.network
 
 logger = logging.getLogger('pulseaudio_dlna.discover')
 
 
-class BaseUpnpMediaRendererDiscover(object):
+class SSDPDiscover(object):
 
     SSDP_ADDRESS = '239.255.255.250'
     SSDP_PORT = 1900
+    SSDP_MX = 3
+    SSDP_TTL = 10
+    SSDP_AMOUNT = 5
+
+    MSEARCH_PORT = 0
+    MSEARCH_MSG = '\r\n'.join([
+        'M-SEARCH * HTTP/1.1',
+        'HOST: {host}:{port}',
+        'MAN: "ssdp:discover"',
+        'MX: {mx}',
+        'ST: ssdp:all',
+    ]) + '\r\n' * 2
+
+    BUFFER_SIZE = 1024
+    USE_SINGLE_SOCKET = True
+
+    def search(self, ssdp_ttl=None, ssdp_mx=None, ssdp_amount=None):
+        ssdp_mx = ssdp_mx or self.SSDP_MX
+        ssdp_ttl = ssdp_ttl or self.SSDP_TTL
+        ssdp_amount = ssdp_amount or self.SSDP_AMOUNT
+
+        if self.USE_SINGLE_SOCKET:
+            logger.debug('Binding socket to "{}" ...'.format(''))
+            self._search('', ssdp_ttl, ssdp_mx, ssdp_amount)
+        else:
+            ips = pulseaudio_dlna.utils.network.ipv4_addresses()
+            threads = []
+            for ip in ips:
+                logger.debug('Binding socket to "{}" ...'.format(ip))
+                thread = threading.Thread(
+                    target=self._search,
+                    args=[ip, ssdp_ttl, ssdp_mx, ssdp_amount])
+                threads.append(thread)
+            for thread in threads:
+                thread.start()
+            for thread in threads:
+                thread.join()
+
+    def _search(self, host, ssdp_ttl, ssdp_mx, ssdp_amount):
+        sock = socket.socket(
+            socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
+        sock.settimeout(ssdp_mx + 2)
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        sock.setsockopt(
+            socket.IPPROTO_IP,
+            socket.IP_MULTICAST_TTL,
+            ssdp_ttl)
+        sock.bind((host, self.MSEARCH_PORT))
+
+        for i in range(1, ssdp_amount + 1):
+            t = threading.Timer(
+                float(i) / 2, self._send_discover, args=[sock, ssdp_mx])
+            t.start()
 
-    MSEARCH = 'M-SEARCH * HTTP/1.1\r\n' + \
-              'HOST: {}:{}\r\n'.format(SSDP_ADDRESS, SSDP_PORT) + \
-              'MAN: "ssdp:discover"\r\n' + \
-              'MX: 2\r\n' + \
-              'ST: ssdp:all\r\n\r\n'
-
-    def search(self, ttl=10, timeout=5, times=4):
-        s.setdefaulttimeout(timeout)
-        sock = s.socket(s.AF_INET, s.SOCK_DGRAM, s.IPPROTO_UDP)
-        sock.setsockopt(s.IPPROTO_IP, s.IP_MULTICAST_TTL, ttl)
-
-        for i in range(0, times):
-            sock.sendto(self.MSEARCH, (self.SSDP_ADDRESS, self.SSDP_PORT))
-            time.sleep(0.1)
-
-        buffer_size = 1024
         while True:
             try:
-                header, address = sock.recvfrom(buffer_size)
+                header, address = sock.recvfrom(self.BUFFER_SIZE)
                 guess = chardet.detect(header)
-                self._header_received(header.decode(guess['encoding']), address)
-            except s.timeout:
+                self._header_received(
+                    header.decode(guess['encoding']), address)
+            except socket.timeout:
                 break
         sock.close()
 
+    def _send_discover(self, sock, ssdp_mx):
+        msg = self.MSEARCH_MSG.format(
+            host=self.SSDP_ADDRESS, port=self.SSDP_PORT, mx=ssdp_mx)
+        sock.sendto(msg, (self.SSDP_ADDRESS, self.SSDP_PORT))
+
     def _header_received(self, header, address):
         pass
 
 
-class RendererDiscover(BaseUpnpMediaRendererDiscover):
+class RendererDiscover(SSDPDiscover):
 
     def __init__(self, renderer_holder):
+        SSDPDiscover.__init__(self)
         self.renderer_holder = renderer_holder
 
-    def search(self, ttl=10, timeout=5, times=2):
+    def search(self, *args, **kwargs):
         self.renderers = []
-        BaseUpnpMediaRendererDiscover.search(self, ttl, timeout, times)
+        SSDPDiscover.search(self, *args, **kwargs)
 
     def _header_received(self, header, address):
         logger.debug('Recieved the following SSDP header: \n{header}'.format(

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images.py Added

@@ -0,0 +1,141 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import with_statement
+
+import tempfile
+import logging
+
+logger = logging.getLogger('pulseaudio_dlna.images')
+
+
+class UnknownImageExtension(Exception):
+ def __init__(self, path):
+ Exception.__init__(
+ self,
+ 'The file "{}" has an unsupported file extension!'.format(path)
+ )
+
+
+class ImageNotAccessible(Exception):
+ def __init__(self, path):
+ Exception.__init__(
+ self,
+ 'The file "{}" is not accessible!'.format(path)
+ )
+
+
+class IconNotFound(Exception):
+ def __init__(self, icon_name):
+ Exception.__init__(
+ self,
+ 'The icon "{}" could not be found!'.format(icon_name)
+ )
+
+
+class MissingDependencies(Exception):
+ def __init__(self, message, dependencies):
+ Exception.__init__(
+ self,
+ '{} - Could not load one of following modules "{}"!'.format(
+ message, ','.join(dependencies))
+ )
+
+
+def get_icon_by_name(name, size=256):
+ try:
+ import gtk
+ except:
+ raise MissingDependencies('Unable to lookup system icons!', ['gtk'])
+
+ icon_theme = gtk.icon_theme_get_default()
+ icon = icon_theme.lookup_icon(name, size, 0)
+ if icon:
+ file_path = icon.get_filename()
+ _type = get_type_by_filepath(file_path)
+ return _type(file_path)
+ else:
+ raise IconNotFound(name)
+
+
+def get_type_by_filepath(path):
+ if path.endswith('.png'):
+ return PngImage
+ elif path.endswith('.jpg'):
+ return JpgImage
+ elif path.endswith('.svg'):
+ return SvgPngImage
+ raise UnknownImageExtension(path)
+
+
+class BaseImage(object):
+ def __init__(self, path, cached=True):
+ self.path = path
+ self.content_type = None
+ self.cached = cached
+
+ if self.cached:
+ self._read_data()
+
+ def _read_data(self):
+ try:
+ with open(self.path) as h:
+ self._data = h.read()
+ except EnvironmentError:
+ raise ImageNotAccessible(self.path)
+
+ @property
+ def data(self):
+ if self.cached:
+ return self._data
+ else:
+ return self._read_data()
+
+
+class PngImage(BaseImage):
+ def __init__(self, path, cached=True):
+ BaseImage.__init__(self, path, cached)
+ self.content_type = 'image/png'
+
+
+class SvgPngImage(BaseImage):
+ def __init__(self, path, cached=True, size=256):
+ try:
+ import cairo
+ import rsvg
+ except:
+ raise MissingDependencies(
+ 'Unable to convert SVG image to PNG!', ['cairo', 'rsvg'])
+
+ tmp_file = tempfile.NamedTemporaryFile()
+ image_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, size, size)
+ rsvg_handle = rsvg.Handle(path)
+
+ context = cairo.Context(image_surface)
+ context.scale(
+ size / rsvg_handle.props.height, size / rsvg_handle.props.width)
+ rsvg_handle.render_cairo(context)
+ image_surface.write_to_png(tmp_file.name)
+
+ BaseImage.__init__(self, tmp_file.name, cached=True)
+
+
+class JpgImage(BaseImage):
+ def __init__(self, path, cached=True):
+ BaseImage.__init__(self, path, cached)
+ self.content_type = 'image/jpeg'

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/default.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-debian.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-fedora.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-gentoo.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-linuxmint.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-opensuse.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-ubuntu.png Added

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/images/distribution-unknown.png Added

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/listener.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/listener.py Changed

@@ -22,10 +22,13 @@
 import socket
 import struct
 import setproctitle
+import time
+import gobject
+import os
+import sys
 import chardet
 
-from pulseaudio_dlna.discover import RendererDiscover
-from pulseaudio_dlna.renderers import RendererHolder
+import pulseaudio_dlna.discover
 
 logger = logging.getLogger('pulseaudio_dlna.listener')
 
@@ -33,11 +36,25 @@
 class SSDPRequestHandler(SocketServer.BaseRequestHandler):
 
     def handle(self):
-        guess = chardet.detect(self.request[0])
-        packet = self.request[0].decode(guess['encoding'])
+        packet = self._decode(self.request[0])
         lines = packet.splitlines()
-        if len(lines) > 0 and self._is_notify_method(lines[0]):
-            self.server.renderers_holder.process_notify_request(packet)
+        if len(lines) > 0:
+            if self._is_notify_method(lines[0]):
+                logger.debug(
+                    'Recieved the following NOTIFY header: \n{header}'.format(
+                        header=packet))
+                if self.server.holder:
+                    self.server.holder.process_notify_request(packet)
+
+    def _decode(self, data):
+        guess = chardet.detect(data)
+        for encoding in [guess['encoding'], 'utf-8', 'ascii']:
+            try:
+                return data.decode(encoding)
+            except:
+                pass
+        logger.error('Could not decode SSDP packet.')
+        return ''
 
     def _is_notify_method(self, method_header):
         method = self._get_method(method_header)
@@ -48,34 +65,84 @@
 
 
 class SSDPListener(SocketServer.UDPServer):
+
+    SSDP_ADDRESS = '239.255.255.250'
+    SSDP_PORT = 1900
+    SSDP_TTL = 10
+
     def __init__(
-            self, stream_server_address, message_queue, plugins,
-            device_filter=None, device_config=None, renderer_urls=None,
-            disable_ssdp_listener=False):
+            self, holder=None,
+            ssdp_ttl=None,
+            disable_ssdp_listener=False,
+            disable_ssdp_search=False):
+        self.holder = holder
+        self.ssdp_ttl = ssdp_ttl or self.SSDP_TTL
         self.disable_ssdp_listener = disable_ssdp_listener
-        self.renderer_urls = renderer_urls
-        self.renderers_holder = RendererHolder(
-            stream_server_address, message_queue, plugins, device_filter,
-            device_config)
-        if not self.disable_ssdp_listener:
-            SocketServer.UDPServer.__init__(
-                self, ('', 1900), SSDPRequestHandler)
-            multicast = struct.pack(
-                "=4sl", socket.inet_aton("239.255.255.250"), socket.INADDR_ANY)
-            self.socket.setsockopt(
-                socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, multicast)
-        if self.renderer_urls is not None:
-            self.renderers_holder.process_locations(self.renderer_urls)
-        else:
-            discover = RendererDiscover(self.renderers_holder)
-            discover.search()
-            logger.info('Discovery complete.')
+        self.disable_ssdp_search = disable_ssdp_search
 
     def run(self):
         if not self.disable_ssdp_listener:
-            setproctitle.setproctitle('ssdp_listener')
-            SocketServer.UDPServer.serve_forever(self)
-
-
-class ThreadedSSDPListener(SocketServer.ThreadingMixIn, SSDPListener):
+            self.allow_reuse_address = True
+            SocketServer.UDPServer.__init__(
+                self, ('', self.SSDP_PORT), SSDPRequestHandler)
+            self.socket.setsockopt(
+                socket.IPPROTO_IP,
+                socket.IP_ADD_MEMBERSHIP,
+                self._multicast_struct(self.SSDP_ADDRESS))
+            self.socket.setsockopt(
+                socket.IPPROTO_IP,
+                socket.IP_MULTICAST_TTL,
+                self.ssdp_ttl)
+
+        if not self.disable_ssdp_search:
+            gobject.timeout_add(100, self.search)
+
+        setproctitle.setproctitle('ssdp_listener')
+        self.serve_forever(self)
+
+    def search(self):
+        discover = pulseaudio_dlna.discover.RendererDiscover(self.holder)
+        discover.search()
+        logger.info('Discovery complete.')
+
+    def _multicast_struct(self, address):
+        return struct.pack(
+            '4sl', socket.inet_aton(address), socket.INADDR_ANY)
+
+
+class GobjectMainLoopMixin:
+
+    def serve_forever(self, poll_interval=0.5):
+        self.mainloop = gobject.MainLoop()
+        if hasattr(self, 'socket'):
+            gobject.io_add_watch(
+                self, gobject.IO_IN | gobject.IO_PRI, self._on_new_request)
+        context = self.mainloop.get_context()
+        while True:
+            try:
+                if context.pending():
+                    context.iteration(True)
+                else:
+                    time.sleep(0.1)
+            except KeyboardInterrupt:
+                break
+
+    def _on_new_request(self, sock, *args):
+        self._handle_request_noblock()
+        return True
+
+    def shutdown(self, *args):
+        logger.debug(
+            'SSDPListener GobjectMainLoopMixin.shutdown() pid: {}'.format(
+                os.getpid()))
+        try:
+            self.socket.shutdown(socket.SHUT_RDWR)
+        except socket.error:
+            pass
+        self.socket.close()
+        sys.exit(0)
+
+
+class ThreadedSSDPListener(
+        GobjectMainLoopMixin, SocketServer.ThreadingMixIn, SSDPListener):
     pass

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/__init__.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/__init__.py Changed

@@ -172,26 +172,31 @@
 
 
 class LoadCommand(commands.BaseCommand):
-    def __init__(self, url, mime_type, title=None, thumb=None,
+    def __init__(self, url, mime_type, artist=None, title=None, thumb=None,
                  session_id=None, destination_id=None, namespace=None):
         commands.BaseCommand.__init__(self)
-        custom_data = {}
-        if title or thumb:
-            custom_data = {
-                'payload': {
-                    'title': title,
-                    'thumb': thumb,
-                }
-            }
         self.data = {
             'autoplay': True,
             'currentTime': 0,
-            'customData': custom_data,
             'media': {'contentId': url,
                       'contentType': mime_type,
-                      'streamType': 'BUFFERED'},
+                      'streamType': 'LIVE',
+                      },
             'type': 'LOAD'
         }
+        if artist or title or thumb:
+            self.data['media']['metadata'] = {
+                'metadataType': 3,
+            }
+            if artist:
+                self.data['media']['metadata']['artist'] = artist
+            if title:
+                self.data['media']['metadata']['title'] = title
+            if thumb:
+                self.data['media']['metadata']['images'] = [
+                    {'url': thumb},
+                ]
+
         self.request_id = False
         self.session_id = False
         self.destination_id = destination_id
@@ -225,12 +230,16 @@
     def launch(self):
         self.launch_application(self.APP_MEDIA_PLAYER)
 
-    def load(self, url, mime_type, title=None, thumb=None):
+    def load(self, url, mime_type, artist=None, title=None, thumb=None):
         self.launch()
         try:
             self.socket.send_and_wait(
                 LoadCommand(
-                    url, mime_type, title, thumb, destination_id=False))
+                    url, mime_type,
+                    artist=artist,
+                    title=title,
+                    thumb=thumb,
+                    destination_id=False))
             return True
         except (cast_socket.NoResponseException, LoadFailedException):
             return False

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/plugins/chromecast/renderer.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/plugins/chromecast/renderer.py Changed

@@ -69,13 +69,18 @@
                 traceback.print_exc()
             return None
 
-    def play(self, url):
+    def play(self, url, artist=None, title=None, thumb=None):
         cast = self._get_media_player()
         if cast is None:
             logger.error('No device was found!')
             return 500
         try:
-            cast.load(url, self.codec.mime_type)
+            cast.load(
+                url,
+                mime_type=self.codec.mime_type,
+                artist=artist,
+                title=title,
+                thumb=thumb)
             self.state = self.PLAYING
             return 200
         except pycastv2.ChannelClosedException:
@@ -116,10 +121,11 @@
 class CoinedChromecastRenderer(
         pulseaudio_dlna.plugins.renderer.CoinedBaseRendererMixin, ChromecastRenderer):
 
-    def play(self, url=None, codec=None):
+    def play(self, url=None, codec=None, artist=None, title=None, thumb=None):
         try:
             stream_url = url or self.get_stream_url()
-            return ChromecastRenderer.play(self, stream_url)
+            return ChromecastRenderer.play(
+                self, stream_url, artist=artist, title=title, thumb=thumb)
         except pulseaudio_dlna.plugins.renderer.NoSuitableEncoderFoundException:
             return 500
 
@@ -137,7 +143,9 @@
                 'Could no connect to {url}. '
                 'Connection refused.'.format(url=url))
             return None
-        soup = BeautifulSoup.BeautifulSoup(response.content.decode('utf-8'))
+        soup = BeautifulSoup.BeautifulSoup(
+            response.content.decode('utf-8'),
+            convertEntities=BeautifulSoup.BeautifulSoup.HTML_ENTITIES)
         url_object = urlparse.urlparse(url)
         ip, port = url_object.netloc.split(':')
         try:

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/plugins/renderer.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/plugins/renderer.py Changed

@@ -207,7 +207,7 @@
             if isinstance(codec, pulseaudio_dlna.codecs.L16Codec):
                 value = codec.priority * 100000
                 if codec.sample_rate:
-                    value += codec.sample_rate / 1000
+                    value += 200 - abs((44100 - codec.sample_rate) / 1000)
                 if codec.channels:
                     value *= codec.channels
                 return value
@@ -306,21 +306,39 @@
         self.server_ip = ip
         self.server_port = port
 
-    def get_stream_url(self):
-        server_url = 'http://{ip}:{port}'.format(
+    def _encode_settings(self, settings, suffix=''):
+        base_url = 'http://{ip}:{port}'.format(
             ip=self.server_ip,
             port=self.server_port,
         )
-        settings = {
-            'udn': self.udn,
-        }
         data_string = ','.join(
             ['{}="{}"'.format(k, v) for k, v in settings.iteritems()])
-        stream_name = '/{base_string}/stream.{suffix}'.format(
+        stream_name = '/{base_string}/{suffix}'.format(
             base_string=urllib.quote(base64.b64encode(data_string)),
-            suffix=self.codec.suffix,
+            suffix=suffix,
         )
-        return urlparse.urljoin(server_url, stream_name)
+        return urlparse.urljoin(base_url, stream_name)
+
+    def get_stream_url(self):
+        settings = {
+            'type': 'bridge',
+            'udn': self.udn,
+        }
+        return self._encode_settings(settings, 'stream.' + self.codec.suffix)
+
+    def get_image_url(self, name='default.png'):
+        settings = {
+            'type': 'image',
+            'name': name,
+        }
+        return self._encode_settings(settings)
+
+    def get_sys_icon_url(self, name):
+        settings = {
+            'type': 'sys-icon',
+            'name': name,
+        }
+        return self._encode_settings(settings)
 
     def play(self):
         raise NotImplementedError()

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/plugins/upnp/renderer.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/plugins/upnp/renderer.py Changed

@@ -20,7 +20,6 @@
 import cgi
 import requests
 import urlparse
-import socket
 import logging
 import pkg_resources
 import BeautifulSoup
@@ -206,7 +205,7 @@
                 status_code=response.status_code,
                 result=response.text))
 
-    def register(self, stream_url, codec=None):
+    def register(self, stream_url, codec=None, artist=None, title=None, thumb=None):
         url = self.service_transport.control_url
         codec = codec or self.codec
         headers = {
@@ -226,10 +225,11 @@
             ])
         metadata = self.xml['register_metadata'].format(
             stream_url=stream_url,
-            title='Live Audio',
-            artist='PulseAudio on {}'.format(socket.gethostname()),
-            creator='PulseAudio',
-            album='Stream',
+            title=title or '',
+            artist=artist or '',
+            albumart=thumb or '',
+            creator='',
+            album='',
             encoding=self.ENCODING,
             mime_type=codec.mime_type,
             content_features=str(content_features),
@@ -380,10 +380,12 @@
 class CoinedUpnpMediaRenderer(
         pulseaudio_dlna.plugins.renderer.CoinedBaseRendererMixin, UpnpMediaRenderer):
 
-    def play(self, url=None, codec=None):
+    def play(self, url=None, codec=None, artist=None, title=None, thumb=None):
         try:
             stream_url = url or self.get_stream_url()
-            return_code = UpnpMediaRenderer.register(self, stream_url, codec)
+            return_code = UpnpMediaRenderer.register(
+                self, stream_url, codec,
+                artist=artist, title=title, thumb=thumb)
             if return_code == 200:
                 return UpnpMediaRenderer.play(self)
             else:
@@ -417,7 +419,9 @@
                 'Could no connect to {url}. '
                 'Connection refused.'.format(url=url))
             return None
-        soup = BeautifulSoup.BeautifulSoup(response.content)
+        soup = BeautifulSoup.BeautifulSoup(
+            response.content,
+            convertEntities=BeautifulSoup.BeautifulSoup.HTML_ENTITIES)
         url_object = urlparse.urlparse(url)
         ip, port = url_object.netloc.split(':')
         services = []

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/plugins/upnp/xml/register_metadata.xml -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/plugins/upnp/xml/register_metadata.xml Changed

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/pulseaudio.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/pulseaudio.py Changed

@@ -35,6 +35,7 @@
 import pulseaudio_dlna.plugins.renderer
 import pulseaudio_dlna.notification
 import pulseaudio_dlna.utils.encoding
+import pulseaudio_dlna.covermodes
 
 logger = logging.getLogger('pulseaudio_dlna.pulseaudio')
 
@@ -166,7 +167,7 @@
 sink_description.replace(' ', '\ ')
 ),
 ]
- module_id = int(subprocess.check_output(cmd))
+ module_id = int(subprocess.check_output(cmd).strip())
 if module_id > 0:
 self.update_sinks()
 for sink in self.sinks:
@@ -185,7 +186,73 @@
 logger.error('Could not remove entity {id}'.format(id=id))
 
 
-class PulseModuleFactory(object):
+class PulseBaseFactory(object):
+
+ @classmethod
+ def _convert_bytes_to_unicode(self, byte_array):
+ name = bytes()
+ for i, b in enumerate(byte_array):
+ if not (i == len(byte_array) - 1 and int(b) == 0):
+ name += struct.pack('<B', b)
+ return name.decode(locale.getpreferredencoding())
+
+
+class PulseClientFactory(PulseBaseFactory):
+
+ @classmethod
+ def new(self, bus, client_path):
+ try:
+ obj = bus.get_object(object_path=client_path)
+ properties = obj.Get('org.PulseAudio.Core1.Client', 'PropertyList')
+ name_bytes = properties.get('application.name', [])
+ icon_bytes = properties.get('application.icon_name', [])
+ binary_bytes = properties.get('application.process.binary', [])
+ return PulseClient(
+ object_path=unicode(client_path),
+ index=unicode(obj.Get('org.PulseAudio.Core1.Client', 'Index')),
+ name=self._convert_bytes_to_unicode(name_bytes),
+ icon=self._convert_bytes_to_unicode(icon_bytes),
+ binary=self._convert_bytes_to_unicode(binary_bytes),
+ )
+ except dbus.exceptions.DBusException:
+ logger.error('PulseClientFactory - Could not get "{object_path}" from dbus.'.format(
+ object_path=client_path))
+ return None
+
+
+@functools.total_ordering
+class PulseClient(object):
+
+ __shared_state = {}
+
+ def __init__(self, object_path, index, name, icon, binary):
+ if object_path not in self.__shared_state:
+ self.__shared_state[object_path] = {}
+ self.__dict__ = self.__shared_state[object_path]
+
+ self.object_path = object_path
+ self.index = index
+ self.name = name or 'unknown'
+ self.icon = icon or 'unknown'
+ self.binary = binary or 'unknown'
+
+ def __eq__(self, other):
+ return self.object_path == other.object_path
+
+ def __gt__(self, other):
+ return self.object_path > other.object_path
+
+ def __str__(self):
+ return '<PulseClient path="{}" index="{}" name="{}" icon="{}" binary={}>\n'.format(
+ self.object_path,
+ self.index,
+ self.name,
+ self.icon,
+ self.binary,
+ )
+
+
+class PulseModuleFactory(PulseBaseFactory):
 
 @classmethod
 def new(self, bus, module_path):
@@ -197,7 +264,7 @@
 name=unicode(obj.Get('org.PulseAudio.Core1.Module', 'Name')),
 )
 except dbus.exceptions.DBusException:
- logger.error('Could not get "{object_path}" from dbus.'.format(
+ logger.error('PulseModuleFactory - Could not get "{object_path}" from dbus.'.format(
 object_path=module_path))
 return None
 
@@ -230,7 +297,7 @@
 )
 
 
-class PulseSinkFactory(object):
+class PulseSinkFactory(PulseBaseFactory):
 
 @classmethod
 def new(self, bus, object_path):
@@ -239,7 +306,6 @@
 
 properties = obj.Get('org.PulseAudio.Core1.Device', 'PropertyList')
 description_bytes = properties.get('device.description', [])
- label = self._convert_bytes_to_unicode(description_bytes)
 module_path = unicode(
 obj.Get('org.PulseAudio.Core1.Device', 'OwnerModule'))
 
@@ -247,22 +313,14 @@
 object_path=unicode(object_path),
 index=unicode(obj.Get('org.PulseAudio.Core1.Device', 'Index')),
 name=unicode(obj.Get('org.PulseAudio.Core1.Device', 'Name')),
- label=label,
+ label=self._convert_bytes_to_unicode(description_bytes),
 module=PulseModuleFactory.new(bus, module_path),
 )
 except dbus.exceptions.DBusException:
- logger.error('Could not get "{object_path}" from dbus.'.format(
+ logger.error('PulseSinkFactory - Could not get "{object_path}" from dbus.'.format(
 object_path=object_path))
 return None
 
- @classmethod
- def _convert_bytes_to_unicode(self, byte_array):
- name = bytes()
- for i, b in enumerate(byte_array):
- if not (i == len(byte_array) - 1 and int(b) == 0):
- name += struct.pack('<B', b)
- return name.decode(locale.getpreferredencoding())
-
 
 @functools.total_ordering
 class PulseSink(object):
@@ -285,6 +343,23 @@
 self.monitor = self.name + '.monitor'
 self.streams = []
 
+ @property
+ def stream_client_names(self):
+ names = []
+ for stream in self.streams:
+ try:
+ names.append(stream.client.name)
+ except:
+ names.append('?')
+ return names
+
+ @property
+ def primary_application_name(self):
+ for stream in self.streams:
+ if stream.client.icon != 'unknown' and stream.client.icon != '':
+ return stream.client.icon
+ return None
+
 def set_as_default_sink(self):
 cmd = [
 'pactl',
@@ -311,7 +386,7 @@
 self.label,
 self.name,
 self.index,
- self.module.index,
+ self.module.index if self.module else None,
 )
 if len(self.streams) == 0:
 string = string + ' -- no streams --'
@@ -327,13 +402,15 @@
 def new(self, bus, stream_path):
 try:
 obj = bus.get_object(object_path=stream_path)
+ client_path = unicode(obj.Get('org.PulseAudio.Core1.Stream', 'Client'))
 return PulseStream(
 object_path=unicode(stream_path),
 index=unicode(obj.Get('org.PulseAudio.Core1.Stream', 'Index')),
 device=unicode(obj.Get('org.PulseAudio.Core1.Stream', 'Device')),
+ client=PulseClientFactory.new(bus, client_path),
 )
 except dbus.exceptions.DBusException:
- logger.error('Could not get "{object_path}" from dbus.'.format(
+ logger.error('PulseStreamFactory - Could not get "{object_path}" from dbus.'.format(
 object_path=stream_path))
 return None
 
@@ -343,7 +420,7 @@
 
 __shared_state = {}
 
- def __init__(self, object_path, index, device):
+ def __init__(self, object_path, index, device, client):
 if object_path not in self.__shared_state:

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/renderers.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/renderers.py Changed

@@ -30,11 +30,13 @@
     SSDP_BYEBYE = 'ssdp:byebye'
 
     def __init__(
-            self, stream_server_address, message_queue, plugins,
+            self, plugins,
+            stream_ip=None, stream_port=None, message_queue=None,
             device_filter=None, device_config=None):
         self.renderers = {}
         self.registered = {}
-        self.stream_server_address = stream_server_address
+        self.stream_ip = stream_ip
+        self.stream_port = stream_port
         self.device_filter = device_filter
         self.device_config = device_config or {}
         self.message_queue = message_queue
@@ -56,9 +58,13 @@
         return None
 
     def process_locations(self, locations):
-        for plugin in self.registered.values():
-            for device in plugin.lookup(locations):
-                self._add_renderer(device.udn, device)
+        try:
+            self.lock.acquire()
+            for plugin in self.registered.values():
+                for device in plugin.lookup(locations):
+                    self._add_renderer(device.udn, device)
+        finally:
+            self.lock.release()
 
     def process_msearch_request(self, header):
         header = self._retrieve_header_map(header)
@@ -66,12 +72,16 @@
 
         if device_id is None:
             return
-        st_header = header.get('st', None)
-        if st_header and st_header in self.registered:
-            if device_id not in self.renderers:
-                device = self.registered[st_header].create_device(header)
-                if device is not None:
-                    self._add_renderer_with_filter_check(device_id, device)
+        try:
+            self.lock.acquire()
+            st_header = header.get('st', None)
+            if st_header and st_header in self.registered:
+                if device_id not in self.renderers:
+                    device = self.registered[st_header].create_device(header)
+                    if device is not None:
+                        self._add_renderer_with_filter_check(device_id, device)
+        finally:
+            self.lock.release()
 
     def process_notify_request(self, header):
         header = self._retrieve_header_map(header)
@@ -110,18 +120,20 @@
             if config:
                 logger.info(
                     'Using device configuration:\n' + device.__str__(True))
-            ip, port = self.stream_server_address
-            device.set_server_location(ip, port)
+            if self.stream_ip and self.stream_port:
+                device.set_server_location(self.stream_ip, self.stream_port)
             self.renderers[device_id] = device
-            self.message_queue.put({
-                'type': 'add_device',
-                'device': device
-            })
+            if self.message_queue:
+                self.message_queue.put({
+                    'type': 'add_device',
+                    'device': device
+                })
 
     def _remove_renderer_by_id(self, device_id):
         device = self.renderers[device_id]
-        self.message_queue.put({
-            'type': 'remove_device',
-            'device': device
-        })
+        if self.message_queue:
+            self.message_queue.put({
+                'type': 'remove_device',
+                'device': device
+            })
         del self.renderers[device_id]

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/streamserver.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/streamserver.py Changed

@@ -34,6 +34,7 @@
 import json
 import os
 import signal
+import pkg_resources
 import BaseHTTPServer
 import SocketServer
 
@@ -41,6 +42,7 @@
 import pulseaudio_dlna.codecs
 import pulseaudio_dlna.recorders
 import pulseaudio_dlna.rules
+import pulseaudio_dlna.images
 
 from pulseaudio_dlna.plugins.upnp.renderer import (
     UpnpContentFeatures, UpnpContentFlags)
@@ -415,15 +417,19 @@
     def do_HEAD(self):
         logger.debug('Got the following HEAD request:\n{header}'.format(
             header=json.dumps(self.headers.items(), indent=2)))
-        self.handle_headers()
+        item = self.get_requested_item()
+        self.handle_headers(item)
 
     def do_GET(self):
         logger.debug('Got the following GET request:\n{header}'.format(
             header=json.dumps(self.headers.items(), indent=2)))
-        bridge = self.handle_headers()
-        if bridge:
-            stream = self.server.stream_manager.get_stream(self.path, bridge)
-            stream.register(bridge, self.request)
+        item = self.get_requested_item()
+        self.handle_headers(item)
+        if isinstance(item, pulseaudio_dlna.images.BaseImage):
+            self.wfile.write(item.data)
+        elif isinstance(item, pulseaudio_dlna.pulseaudio.PulseBridge):
+            stream = self.server.stream_manager.get_stream(self.path, item)
+            stream.register(item, self.request)
             self.keep_connection_alive()
 
     def keep_connection_alive(self):
@@ -438,13 +444,20 @@
                 break
             time.sleep(1)
 
-    def handle_headers(self):
-        bridge = self.chop_request_path(self.path)
-        if bridge:
-            response_code = 200
-            headers = {
-                'Content-Type': bridge.device.codec.specific_mime_type,
-            }
+    def handle_headers(self, item):
+        response_code = 200
+        headers = {}
+
+        if not item:
+            logger.info('Error 404: File not found "{}"'.format(self.path))
+            self.send_error(404, 'File not found: %s' % self.path)
+            return
+        elif isinstance(item, pulseaudio_dlna.images.BaseImage):
+            image = item
+            headers['Content-Type'] = image.content_type
+        elif isinstance(item, pulseaudio_dlna.pulseaudio.PulseBridge):
+            bridge = item
+            headers['Content-Type'] = bridge.device.codec.specific_mime_type
 
             if self.server.fake_http_content_length or \
                pulseaudio_dlna.rules.FAKE_HTTP_CONTENT_LENGTH in bridge.device.codec.rules:
@@ -478,23 +491,52 @@
                 headers['Ext'] = ''
                 headers['transferMode.dlna.org'] = 'Streaming'
 
-            logger.debug('Sending header ({response_code}):\n{header}'.format(
-                response_code=response_code,
-                header=json.dumps(headers, indent=2),
-            ))
-            self.send_response(response_code)
-            for name, value in headers.items():
-                self.send_header(name, value)
-            self.end_headers()
-            return bridge
-        else:
-            logger.info('Error 404: File not found "{}"'.format(self.path))
-            self.send_error(404, 'File not found: %s' % self.path)
-            return None
+        logger.debug('Sending header ({response_code}):\n{header}'.format(
+            response_code=response_code,
+            header=json.dumps(headers, indent=2),
+        ))
+        self.send_response(response_code)
+        for name, value in headers.items():
+            self.send_header(name, value)
+        self.end_headers()
+
+    def get_requested_item(self):
+        settings = self._decode_settings(self.path)
+        if settings.get('type', None) == 'bridge':
+            for bridge in self.server.bridges:
+                if settings.get('udn') == bridge.device.udn:
+                    return bridge
+        elif settings.get('type', None) == 'image':
+            image_name = settings.get('name', None)
+            if image_name:
+                image_path = pkg_resources.resource_filename(
+                    'pulseaudio_dlna.streamserver', os.path.join(
+                        'images', os.path.basename(image_name)))
+                try:
+                    _type = pulseaudio_dlna.images.get_type_by_filepath(
+                        image_path)
+                    return _type(path=image_path, cached=True)
+                except (pulseaudio_dlna.images.UnknownImageExtension,
+                        pulseaudio_dlna.images.ImageNotAccessible,
+                        pulseaudio_dlna.images.MissingDependencies,
+                        pulseaudio_dlna.images.IconNotFound) as e:
+                    logger.error(e)
+        elif settings.get('type', None) == 'sys-icon':
+            icon_name = settings.get('name', None)
+            if icon_name:
+                try:
+                    return pulseaudio_dlna.images.get_icon_by_name(
+                        os.path.basename(icon_name), size=512)
+                except (pulseaudio_dlna.images.UnknownImageExtension,
+                        pulseaudio_dlna.images.ImageNotAccessible,
+                        pulseaudio_dlna.images.MissingDependencies,
+                        pulseaudio_dlna.images.IconNotFound) as e:
+                    logger.error(e)
+        return None
 
-    def chop_request_path(self, path):
+    def _decode_settings(self, path):
         try:
-            data_quoted, suffix = re.findall(r'/(.*?)/stream\.(.*)', path)[0]
+            data_quoted = re.findall(r'/(.*?)/', path)[0]
             data_string = base64.b64decode(urllib.unquote(data_quoted))
             settings = {
                 k: v for k, v in re.findall('(.*?)="(.*?)",?', data_string)
@@ -503,12 +545,10 @@
                 'URL settings: {path} ({data_string})'.format(
                     path=path,
                     data_string=data_string))
-            for bridge in self.server.bridges:
-                if settings.get('udn') == bridge.device.udn:
-                    return bridge
+            return settings
         except (TypeError, ValueError, IndexError):
             pass
-        return None
+        return {}
 
     def log_message(self, format, *args):
         args = [unicode(arg) for arg in args]
@@ -523,10 +563,6 @@
     def __init__(
             self, ip, port, bridges, message_queue,
             fake_http_content_length=False, *args):
-        SocketServer.TCPServer.allow_reuse_address = True
-        SocketServer.TCPServer.__init__(
-            self, ('', port), StreamRequestHandler, *args)
-
         self.ip = ip
         self.port = port
         self.bridges = bridges
@@ -534,13 +570,11 @@
         self.stream_manager = StreamManager(self)
         self.fake_http_content_length = fake_http_content_length
 
-    def get_server_url(self):
-        return 'http://{ip}:{port}'.format(
-            ip=self.ip,
-            port=self.port,
-        )
-
     def run(self):
+        self.allow_reuse_address = True
+        SocketServer.TCPServer.__init__(
+            self, ('', self.port), StreamRequestHandler)
+
         setproctitle.setproctitle('stream_server')
         self.serve_forever()
 
@@ -549,8 +583,9 @@
 
     def serve_forever(self, poll_interval=0.5):
         self.mainloop = gobject.MainLoop()
-        gobject.io_add_watch(
-            self, gobject.IO_IN | gobject.IO_PRI, self._on_new_request)
+        if hasattr(self, 'socket'):
+            gobject.io_add_watch(
+                self, gobject.IO_IN | gobject.IO_PRI, self._on_new_request)
         context = self.mainloop.get_context()
         while True:
             try:
@@ -566,7 +601,7 @@
         return True
 
     def shutdown(self, *args):
-        logger.info(
+        logger.debug(
             'StreamServer GobjectMainLoopMixin.shutdown() pid: {}'.format(

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/utils/git.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/utils/git.py Changed

@@ -17,18 +17,31 @@
 
 from __future__ import unicode_literals
 
-import commands
-
-
-def describe_tags():
-    status_code, result = commands.getstatusoutput('git describe --tags')
-    if status_code == 0:
-        return result
-    return 'unknown'
-
-
-def short_revision_hash():
-    status_code, result = commands.getstatusoutput('git rev-parse --short HEAD')
-    if status_code == 0:
-        return result
-    return 'unknown'
+import os
+
+GIT_DIRECTORY = '../../.git/'
+
+
+def get_head_version():
+
+    def _get_first_line(path):
+        try:
+            with open(path) as f:
+                content = f.readlines()
+                return content[0]
+        except EnvironmentError:
+            return None
+
+    module_path = os.path.dirname(os.path.abspath(__file__))
+    head_path = os.path.join(module_path, GIT_DIRECTORY, 'HEAD')
+    line = _get_first_line(head_path)
+
+    if not line:
+        return None, None
+    elif line.startswith('ref: '):
+        prefix, ref_path = [s.strip() for s in line.split('ref: ')]
+        branch = os.path.basename(ref_path)
+        ref_path = os.path.join(module_path, GIT_DIRECTORY, ref_path)
+        return branch, _get_first_line(ref_path).strip()
+    else:
+        return 'detached-head', line.strip()

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/utils/network.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/utils/network.py Changed

pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/utils/psutil.py Added

@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import logging
+import psutil
+
+logger = logging.getLogger('pulseaudio_dlna.utils.psutil')
+
+
+__series__ = int(psutil.__version__[:1])
+
+NoSuchProcess = psutil.NoSuchProcess
+TimeoutExpired = psutil.TimeoutExpired
+
+
+def wait_procs(*args, **kwargs):
+ return psutil.wait_procs(*args, **kwargs)
+
+
+def process_iter(*args, **kwargs):
+ for p in psutil.process_iter(*args, **kwargs):
+ p.__class__ = Process
+ yield p
+
+
+if __series__ >= 2:
+ class Process(psutil.Process):
+ pass
+else:
+ class Process(psutil.Process):
+
+ def name(self):
+ return self._platform_impl.get_process_name()
+
+ def uids(self):
+ return self._platform_impl.get_process_uids()
+
+ def gids(self):
+ return self._platform_impl.get_process_gids()

pulseaudio-dlna-0.4.6.tar.gz/pulseaudio_dlna/utils/subprocess.py -> pulseaudio-dlna-0.4.7.tar.gz/pulseaudio_dlna/utils/subprocess.py Changed

pulseaudio-dlna-0.4.7.tar.gz/samples/images/application.png Added

pulseaudio-dlna-0.4.6.tar.gz/scripts/radio.py -> pulseaudio-dlna-0.4.7.tar.gz/scripts/radio.py Changed

@@ -18,7 +18,6 @@
 
 from __future__ import unicode_literals
 
-import multiprocessing
 import requests
 import logging
 import sys
@@ -70,16 +69,19 @@
                     'The device "{name}" failed to stop ({code})'.format(
                         name=device.label, code=return_code))
 
-    def play(self, url, name, flavour=None):
-        self.thread_pool.submit(self._play, url, name, flavour)
+    def play(self, url, name, flavour=None,
+             artist=None, title=None, thumb=None):
+        self.thread_pool.submit(
+            self._play, url, name, flavour, artist, title, thumb)
 
-    def _play(self, url, name, flavour=None):
+    def _play(self, url, name, flavour=None,
+              artist=None, title=None, thumb=None):
         if url.lower().endswith('.m3u'):
             url = self._get_playlist_url(url)
         codec = self._get_codec(url)
         device = self._get_device(name, flavour)
         if device:
-            return_code = device.play(url, codec)
+            return_code = device.play(url, codec, artist, title, thumb)
             if return_code == 200:
                 logger.info(
                     'The device "{name}" was instructed to play'.format(
@@ -114,8 +116,7 @@
         return None
 
     def _discover_devices(self):
-        holder = pulseaudio_dlna.renderers.RendererHolder(
-            ('', 0), multiprocessing.Queue(), self.PLUGINS)
+        holder = pulseaudio_dlna.renderers.RendererHolder(self.PLUGINS)
         discover = pulseaudio_dlna.discover.RendererDiscover(holder)
         discover.search()
         logger.info('Found the following devices:')
@@ -135,8 +136,9 @@
     sys.exit(0)
 
 devices = [
-    ('Wohnzimmer', 'DLNA'),
-    ('Kueche', 'DLNA'),
+    ('Wohnzimmer', 'Chromecast'),
+    ('Küche', 'Chromecast'),
+    ('Schlafzimmer', 'Chromecast'),
 ]
 
 for device in devices:
@@ -144,4 +146,7 @@
     if len(args) > 0 and args[0] == '--stop':
         rl.stop(name, flavour)
     else:
-        rl.play('http://www.wdr.de/wdrlive/media/einslive.m3u', name, flavour)
+        rl.play(
+            'http://www.wdr.de/wdrlive/media/einslive.m3u', name, flavour,
+            'Radio', 'Einslive',
+            'https://lh4.ggpht.com/7ssDAyz52UL1ahViwMkCrtfbdj45RU1Gqqpw3ncYjMrjhZofECX01j4nBufhCAkRFtRm=w600')

pulseaudio-dlna-0.4.6.tar.gz/setup.py -> pulseaudio-dlna-0.4.7.tar.gz/setup.py Changed