Refactor Manager interface

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 7b6f243d74c24cdc66d6378b3ebd4cd7217c25c9..9878de1595a5bd338ecb904ac27063cd51392114 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -23,15 +23,19 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;
 
 import java.io.IOException;
 import java.util.List;

-import java.util.Set;

 import java.util.concurrent.TimeUnit;
 
 public class DaemonCommand implements MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 import java.util.concurrent.TimeUnit;
 
 public class DaemonCommand implements MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);

-    private final OutputWriter outputWriter;

 
 

-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public String getName() {
+        return "daemon";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {

         subparser.help("Run in daemon mode and provide an experimental dbus interface.");
         subparser.addArgument("--system")
                 .action(Arguments.storeTrue())
         subparser.help("Run in daemon mode and provide an experimental dbus interface.");
         subparser.addArgument("--system")
                 .action(Arguments.storeTrue())


@@ -41,17 +45,15 @@ public class DaemonCommand implements MultiLocalCommand {
                 .action(Arguments.storeTrue());
     }
 
                 .action(Arguments.storeTrue());
     }
 

-    public DaemonCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
-    }
-

     @Override
     @Override

-    public Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    public List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;
         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;


@@ -63,7 +65,7 @@ public class DaemonCommand implements MultiLocalCommand {
 
         try (var conn = DBusConnection.getConnection(busType)) {
             var objectPath = DbusConfig.getObjectPath();
 
         try (var conn = DBusConnection.getConnection(busType)) {
             var objectPath = DbusConfig.getObjectPath();

-            var t = run(conn, objectPath, m, ignoreAttachments);
+            var t = run(conn, objectPath, m, outputWriter, ignoreAttachments);

 
             conn.requestBusName(DbusConfig.getBusname());
 
 
             conn.requestBusName(DbusConfig.getBusname());
 


@@ -73,13 +75,13 @@ public class DaemonCommand implements MultiLocalCommand {
             }
         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);
             }
         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);

-            throw new UnexpectedErrorException("Dbus command failed");
+            throw new UnexpectedErrorException("Dbus command failed", e);

         }
     }
 
     @Override
     public void handleCommand(
         }
     }
 
     @Override
     public void handleCommand(

-            final Namespace ns, final List<Manager> managers, SignalCreator c
+            final Namespace ns, final List<Manager> managers, final SignalCreator c, final OutputWriter outputWriter

     ) throws CommandException {
         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
     ) throws CommandException {
         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 


@@ -93,8 +95,8 @@ public class DaemonCommand implements MultiLocalCommand {
         try (var conn = DBusConnection.getConnection(busType)) {
             final var signalControl = new DbusSignalControlImpl(c, m -> {
                 try {
         try (var conn = DBusConnection.getConnection(busType)) {
             final var signalControl = new DbusSignalControlImpl(c, m -> {
                 try {

-                    final var objectPath = DbusConfig.getObjectPath(m.getUsername());
-                    return run(conn, objectPath, m, ignoreAttachments);
+                    final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+                    return run(conn, objectPath, m, outputWriter, ignoreAttachments);

                 } catch (DBusException e) {
                     logger.error("Failed to export object", e);
                     return null;
                 } catch (DBusException e) {
                     logger.error("Failed to export object", e);
                     return null;


@@ -111,12 +113,12 @@ public class DaemonCommand implements MultiLocalCommand {
             signalControl.run();
         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);
             signalControl.run();
         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);

-            throw new UnexpectedErrorException("Dbus command failed");
+            throw new UnexpectedErrorException("Dbus command failed", e);

         }
     }
 
     private Thread run(
         }
     }
 
     private Thread run(

-            DBusConnection conn, String objectPath, Manager m, boolean ignoreAttachments
+            DBusConnection conn, String objectPath, Manager m, OutputWriter outputWriter, boolean ignoreAttachments

     ) throws DBusException {
         conn.exportObject(new DbusSignalImpl(m, objectPath));
 
     ) throws DBusException {
         conn.exportObject(new DbusSignalImpl(m, objectPath));
 


@@ -132,8 +134,6 @@ public class DaemonCommand implements MultiLocalCommand {
                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);
                     break;
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);

-                } catch (InterruptedException ignored) {
-                    break;

                 }
             }
         });
                 }
             }
         });