webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-02 12:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor improvements to GetAttachmentCommand

Browse source
This commit is contained in:
cedb 2022-11-01 16:32:45 -04:00
parent 14c339a04c
commit 188149a51a
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
View file

@ -5,12 +5,14 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.json.JsonAttachmentData; import org.asamk.signal.json.JsonAttachmentData;
import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.Manager;
import org.asamk.signal.output.JsonWriter; import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.output.PlainTextWriter;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Base64; import java.util.Base64;
@ -25,7 +27,14 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
@Override @Override
public void attachToSubparser(final Subparser subparser) { public void attachToSubparser(final Subparser subparser) {
subparser.addArgument("--id") subparser.addArgument("--id")
.required(true)
.help("The ID of the attachment file."); .help("The ID of the attachment file.");
var mut = subparser.addMutuallyExclusiveGroup()
.required(true);
mut.addArgument("--recipient")
.help("Sender of the attachment");
mut.addArgument("-g", "--group-id")
.help("Group in which the attachment was received");
} }
@Override @Override
@ -44,10 +53,11 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
if (outputWriter instanceof PlainTextWriter writer) { if (outputWriter instanceof PlainTextWriter writer) {
writer.println(base64); writer.println(base64);
} } else if (outputWriter instanceof JsonWriter writer) {
else if (outputWriter instanceof JsonWriter writer) {
writer.write(new JsonAttachmentData(base64)); writer.write(new JsonAttachmentData(base64));
} }
} catch (FileNotFoundException ex) {
throw new UserErrorException("Could not find attachment with ID: " + id);
} catch (IOException ex) { } catch (IOException ex) {
throw new UnexpectedErrorException("An error occurred reading attachment: " + id, ex); throw new UnexpectedErrorException("An error occurred reading attachment: " + id, ex);
} }

2
src/main/java/org/asamk/signal/json/JsonAttachmentData.java
View file

@ -1,3 +1,3 @@
package org.asamk.signal.json; package org.asamk.signal.json;
public record JsonAttachmentData(String dataBase64) {} public record JsonAttachmentData(String data) {}