Refactor examples to use lib

Author: paxal

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /composer.lock
+/.idea
 /.phpcs-cache

Makefile

@@ -11,7 +11,12 @@ vendor/autoload.php: composer.lock
 	$(COMPOSER) install
 
 phpstan: vendor/bin/phpstan
-	$(PHP) vendor/bin/phpstan analyse -l max lib -a include/dbus-php.php
+	$(PHP) vendor/bin/phpstan analyse -l max -a  lib/ examples/
 
 phpcs phpcbf: vendor/bin/$@
 	$(PHP) vendor/bin/$@
+
+examples:
+	(echo $(PHP) examples/bluez-music-notify.php ; echo $(PHP) examples/bluez-volume-sync.php) | parallel -u
+
+.PHONY: examples

examples/bluez-music-notify.php

@@ -3,56 +3,21 @@
 declare(strict_types=1);
 
 use Paxal\DBus\DBus;
-use Paxal\DBus\DBusMessageIterDecoder;
-use Paxal\DBus\Message;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 $ffi = require_once __DIR__ . '/../load.php';
 
-$err = $ffi->new('struct DBusError');
-$ffi->dbus_error_init(FFI::addr($err));
-$args = $ffi->new('struct DBusMessageIter');
-$conn = $ffi->dbus_bus_get(DBus::BUS_SYSTEM, FFI::addr($err));
-
-$ffi->dbus_bus_add_match(
-    $conn,
-    'arg0=org.bluez.MediaPlayer1',
-    FFI::addr($err)
-);
-$ffi->dbus_connection_flush($conn);
-if ($ffi->dbus_error_is_set(FFI::addr($err))) {
-    fprintf(stderr, "Match Error (%s)\n", $err->message);
-    exit(1);
-}
-
-$decoder = new DBusMessageIterDecoder($ffi);
-
+$dbus = DBus::connect(DBus::BUS_SYSTEM);
+$dbus->addMatch('arg0=org.bluez.MediaPlayer1');
 $lastItem = null;
 while (true) {
-    $ffi->dbus_connection_read_write($conn, 0);
-    $msg = $ffi->dbus_connection_pop_message($conn);
-    $end = microtime(true);
-
-    // loop again if we haven't read a message
-    if ($msg === null) {
-        usleep(100000);
+    usleep(10);
+    $message = $dbus->waitLoop();
+    if ($message === null) {
         continue;
     }
 
-    if (! $ffi->dbus_message_iter_init($msg, FFI::addr($args))) {
-        error_log("Message has no arguments!\n");
-        continue;
-    }
-
-    $message            = new Message();
-    $message->interface = $ffi->dbus_message_get_interface($msg);
-    $message->path      = $ffi->dbus_message_get_path($msg);
-    $message->member    = $ffi->dbus_message_get_member($msg);
-    $message->arguments = $decoder->decode($args);
-
-    $ffi->dbus_message_unref($msg);
-
-    if (strpos($message->path, '/org/bluez') !== 0) {
+    if (strpos($message->path ?? '', '/org/bluez') !== 0) {
         continue;
     }
 
@@ -87,5 +52,7 @@
     $lastItem         = $item;
     $arguments        = ['-t', '5000', '-a', 'Music', $track['Title'], $track['Artist'] . ' - ' . $track['Album']];
     $escapedArguments = array_map('escapeshellarg', $arguments);
+
+    echo sprintf('%s %s', $track['Title'], $track['Artist'] . ' - ' . $track['Album']) . PHP_EOL;
     exec('notify-send ' . implode(' ', $escapedArguments));
 }

examples/bluez-volume-sync.php

@@ -3,58 +3,23 @@
 declare(strict_types=1);
 
 use Paxal\DBus\DBus;
-use Paxal\DBus\DBusMessageIterDecoder;
-use Paxal\DBus\Message;
 
 const BLUEZ_TO_PA_FACTOR = 65535/127;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 $ffi = require_once __DIR__ . '/../load.php';
 
-$err = $ffi->new('struct DBusError');
-$ffi->dbus_error_init(FFI::addr($err));
-$args = $ffi->new('struct DBusMessageIter');
-$conn = $ffi->dbus_bus_get(DBus::BUS_SYSTEM, FFI::addr($err));
+$dbus = DBus::connect(DBus::BUS_SYSTEM);
+$dbus->addMatch('arg0=org.bluez.MediaTransport1');
 
-$ffi->dbus_bus_add_match(
-    $conn,
-    'arg0=org.bluez.MediaTransport1',
-    FFI::addr($err)
-);
-$ffi->dbus_connection_flush($conn);
-if ($ffi->dbus_error_is_set(FFI::addr($err))) {
-    fprintf(STDERR, "Match Error (%s)\n", $err->message);
-    exit(1);
-}
-
-$decoder = new DBusMessageIterDecoder($ffi);
-
-$lastItem = null;
 while (true) {
-    $ffi->dbus_connection_read_write($conn, 0);
-    $msg = $ffi->dbus_connection_pop_message($conn);
-    $end = microtime(true);
-
-    // loop again if we haven't read a message
-    if ($msg === null) {
-        usleep(100000);
+    $message = $dbus->waitLoop();
+    if ($message === null) {
+        usleep(10);
         continue;
     }
 
-    if (! $ffi->dbus_message_iter_init($msg, FFI::addr($args))) {
-        error_log("Message has no arguments!\n");
-        continue;
-    }
-
-    $message            = new Message();
-    $message->interface = $ffi->dbus_message_get_interface($msg);
-    $message->path      = $ffi->dbus_message_get_path($msg);
-    $message->member    = $ffi->dbus_message_get_member($msg);
-    $message->arguments = $decoder->decode($args);
-
-    $ffi->dbus_message_unref($msg);
-
-    if (strpos($message->path, '/org/bluez') !== 0) {
+    if (strpos($message->path ?? '', '/org/bluez') !== 0) {
         continue;
     }
 
@@ -77,7 +42,7 @@
         continue;
     }
 
-    $addr     = preg_replace('@^.*/dev_(.*?)(/.*)$@', '$1', $message->path);
+    $addr     = preg_replace('@^.*/dev_(.*?)(/.*)$@', '$1', (string) $message->path);
     $paVolume = (int) (BLUEZ_TO_PA_FACTOR * (int) $volume);
     echo 'Set volume to ' . round($paVolume / 65535 * 100) . '%' . PHP_EOL;
     exec(sprintf('pactl set-source-volume bluez_source.%s.a2dp_source %s', $addr, $paVolume));

include/ffi.php

@@ -72,12 +72,14 @@ final class DBus
     public const TYPE_DICT_ENTRY_AS_STRING = 'e';
 
     /** @var PaxalDbusPhp */
-    public static FFI $ffi;
+    public static $ffi;
     private CData $conn;
+    private static DBusMessageIterDecoder $decoder;
 
     private static function init() : void
     {
-        self::$ffi = require __DIR__ . '/../load.php';
+        self::$ffi     = require __DIR__ . '/../load.php';
+        self::$decoder = new DBusMessageIterDecoder(self::$ffi);
     }
 
     private function __construct(FFI\CData $conn)
@@ -130,8 +132,7 @@ public function waitLoop() : ?Message
             return null;
         }
 
-        $args    = self::$ffi->new('struct DBusMessageIter');
-        $decoder = new DBusMessageIterDecoder(self::$ffi);
+        $args = self::$ffi->new('struct DBusMessageIter');
         if (! self::$ffi->dbus_message_iter_init($msg, FFI::addr($args))) {
             trigger_error("Message has no arguments!\n", E_USER_WARNING);
 
@@ -142,7 +143,7 @@ public function waitLoop() : ?Message
         $message->interface = self::$ffi->dbus_message_get_interface($msg);
         $message->path      = self::$ffi->dbus_message_get_path($msg);
         $message->member    = self::$ffi->dbus_message_get_member($msg);
-        $message->arguments = $decoder->decode($args);
+        $message->arguments = self::$decoder->decode($args);
 
         self::$ffi->dbus_message_unref($msg);