Skip to content

PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.

feat(android): send photos and files from the phone

baiyuze030d69664c91
diff --git a/client-core/internal/rpc/server.go b/client-core/internal/rpc/server.go
index d03be2e..64e7d20 100644
--- a/client-core/internal/rpc/server.go
+++ b/client-core/internal/rpc/server.go
@@ -104,6 +104,8 @@ type Deps struct {
WebShare WebShare
// SubmitText 把发送页里输入的文字当成本机复制,见 sync.Engine.SubmitLocal;为 nil 时返回 Unimplemented
SubmitText func(ctx context.Context, text string) (store.Clip, error)
+ // SubmitFiles 把发送页里选的照片和文件当成本机复制;为 nil 时返回 Unimplemented
+ SubmitFiles func(ctx context.Context, paths []string) (store.Clip, error)
}
func (s *Server) GetNotificationStatus(ctx context.Context, _ *pb.Empty) (*pb.NotificationStatus, error) {
diff --git a/client-core/internal/rpc/webshare.go b/client-core/internal/rpc/webshare.go
index e404d5a..13ac430 100644
--- a/client-core/internal/rpc/webshare.go
+++ b/client-core/internal/rpc/webshare.go
@@ -98,3 +98,23 @@ func (s *Server) SubmitText(ctx context.Context, req *pb.SubmitTextRequest) (*pb
}
return clipToProto(clip), nil
}
+
+func (s *Server) SubmitFiles(ctx context.Context, req *pb.SubmitFilesRequest) (*pb.ClipRecord, error) {
+ if s.deps.SubmitFiles == nil {
+ return nil, status.Error(codes.Unimplemented, "submit files unavailable")
+ }
+ paths := make([]string, 0, len(req.GetPaths()))
+ for _, p := range req.GetPaths() {
+ if p != "" {
+ paths = append(paths, p)
+ }
+ }
+ if len(paths) == 0 {
+ return nil, status.Error(codes.InvalidArgument, "没有要发送的文件")
+ }
+ clip, err := s.deps.SubmitFiles(ctx, paths)
+ if err != nil {
+ return nil, status.Error(codes.Internal, err.Error())
+ }
+ return clipToProto(clip), nil
+}
diff --git a/client-core/mobile/mobile.go b/client-core/mobile/mobile.go
index aad5508..85d349f 100644
--- a/client-core/mobile/mobile.go
+++ b/client-core/mobile/mobile.go
@@ -373,6 +373,9 @@ func start(dataDir, deviceName, version string, host Host) (_ *core, err error)
// 手机本机的内容:不写回手机自己的剪贴板
return engine.SubmitLocal(ctx, clipboard.Content{Kind: clipboard.KindText, Text: text}, "", false)
},
+ SubmitFiles: func(ctx context.Context, paths []string) (store.Clip, error) {
+ return engine.SubmitLocal(ctx, clipboard.Content{Kind: clipboard.KindFile, Files: paths}, "", false)
+ },
}, hub, token)
go func() {
diff --git a/proto/gen/pasteferry/v1/daemon.pb.go b/proto/gen/pasteferry/v1/daemon.pb.go
index 186b4b6..abd1036 100644
--- a/proto/gen/pasteferry/v1/daemon.pb.go
+++ b/proto/gen/pasteferry/v1/daemon.pb.go
@@ -6025,6 +6025,50 @@ func (x *SubmitTextRequest) GetText() string {
return ""
}
+type SubmitFilesRequest struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *SubmitFilesRequest) Reset() {
+ *x = SubmitFilesRequest{}
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[75]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *SubmitFilesRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SubmitFilesRequest) ProtoMessage() {}
+
+func (x *SubmitFilesRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[75]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SubmitFilesRequest.ProtoReflect.Descriptor instead.
+func (*SubmitFilesRequest) Descriptor() ([]byte, []int) {
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{75}
+}
+
+func (x *SubmitFilesRequest) GetPaths() []string {
+ if x != nil {
+ return x.Paths
+ }
+ return nil
+}
+
type WebShareStatus struct {
state protoimpl.MessageState `protogen:"open.v1"`
Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
@@ -6046,7 +6090,7 @@ type WebShareStatus struct {
func (x *WebShareStatus) Reset() {
*x = WebShareStatus{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[75]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[76]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6058,7 +6102,7 @@ func (x *WebShareStatus) String() string {
func (*WebShareStatus) ProtoMessage() {}
func (x *WebShareStatus) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[75]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[76]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6071,7 +6115,7 @@ func (x *WebShareStatus) ProtoReflect() protoreflect.Message {
// Deprecated: Use WebShareStatus.ProtoReflect.Descriptor instead.
func (*WebShareStatus) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{75}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{76}
}
func (x *WebShareStatus) GetEnabled() bool {
@@ -6142,7 +6186,7 @@ type WebSession struct {
func (x *WebSession) Reset() {
*x = WebSession{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[76]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[77]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6154,7 +6198,7 @@ func (x *WebSession) String() string {
func (*WebSession) ProtoMessage() {}
func (x *WebSession) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[76]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[77]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6167,7 +6211,7 @@ func (x *WebSession) ProtoReflect() protoreflect.Message {
// Deprecated: Use WebSession.ProtoReflect.Descriptor instead.
func (*WebSession) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{76}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{77}
}
func (x *WebSession) GetId() string {
@@ -6207,7 +6251,7 @@ type SetWebShareRequest struct {
func (x *SetWebShareRequest) Reset() {
*x = SetWebShareRequest{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[77]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[78]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6219,7 +6263,7 @@ func (x *SetWebShareRequest) String() string {
func (*SetWebShareRequest) ProtoMessage() {}
func (x *SetWebShareRequest) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[77]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[78]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6232,7 +6276,7 @@ func (x *SetWebShareRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use SetWebShareRequest.ProtoReflect.Descriptor instead.
func (*SetWebShareRequest) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{77}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{78}
}
func (x *SetWebShareRequest) GetEnabled() bool {
@@ -6251,7 +6295,7 @@ type NewWebShareInviteRequest struct {
func (x *NewWebShareInviteRequest) Reset() {
*x = NewWebShareInviteRequest{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[78]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[79]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6263,7 +6307,7 @@ func (x *NewWebShareInviteRequest) String() string {
func (*NewWebShareInviteRequest) ProtoMessage() {}
func (x *NewWebShareInviteRequest) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[78]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[79]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6276,7 +6320,7 @@ func (x *NewWebShareInviteRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use NewWebShareInviteRequest.ProtoReflect.Descriptor instead.
func (*NewWebShareInviteRequest) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{78}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{79}
}
func (x *NewWebShareInviteRequest) GetAddress() string {
@@ -6300,7 +6344,7 @@ type WebShareInvite struct {
func (x *WebShareInvite) Reset() {
*x = WebShareInvite{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[79]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[80]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6312,7 +6356,7 @@ func (x *WebShareInvite) String() string {
func (*WebShareInvite) ProtoMessage() {}
func (x *WebShareInvite) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[79]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[80]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6325,7 +6369,7 @@ func (x *WebShareInvite) ProtoReflect() protoreflect.Message {
// Deprecated: Use WebShareInvite.ProtoReflect.Descriptor instead.
func (*WebShareInvite) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{79}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{80}
}
func (x *WebShareInvite) GetId() string {
@@ -6372,7 +6416,7 @@ type WebShareInviteRef struct {
func (x *WebShareInviteRef) Reset() {
*x = WebShareInviteRef{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[80]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[81]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6384,7 +6428,7 @@ func (x *WebShareInviteRef) String() string {
func (*WebShareInviteRef) ProtoMessage() {}
func (x *WebShareInviteRef) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[80]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[81]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6397,7 +6441,7 @@ func (x *WebShareInviteRef) ProtoReflect() protoreflect.Message {
// Deprecated: Use WebShareInviteRef.ProtoReflect.Descriptor instead.
func (*WebShareInviteRef) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{80}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{81}
}
func (x *WebShareInviteRef) GetId() string {
@@ -6416,7 +6460,7 @@ type WebSessionRef struct {
func (x *WebSessionRef) Reset() {
*x = WebSessionRef{}
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[81]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[82]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -6428,7 +6472,7 @@ func (x *WebSessionRef) String() string {
func (*WebSessionRef) ProtoMessage() {}
func (x *WebSessionRef) ProtoReflect() protoreflect.Message {
- mi := &file_pasteferry_v1_daemon_proto_msgTypes[81]
+ mi := &file_pasteferry_v1_daemon_proto_msgTypes[82]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -6441,7 +6485,7 @@ func (x *WebSessionRef) ProtoReflect() protoreflect.Message {
// Deprecated: Use WebSessionRef.ProtoReflect.Descriptor instead.
func (*WebSessionRef) Descriptor() ([]byte, []int) {
- return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{81}
+ return file_pasteferry_v1_daemon_proto_rawDescGZIP(), []int{82}
}
func (x *WebSessionRef) GetId() string {
@@ -6924,7 +6968,9 @@ const file_pasteferry_v1_daemon_proto_rawDesc = "" +
"free_bytes\x18\x03 \x01(\x03R\tfreeBytes\x12\x12\n" +
"\x04path\x18\x04 \x01(\tR\x04path\"'\n" +
"\x11SubmitTextRequest\x12\x12\n" +
- "\x04text\x18\x01 \x01(\tR\x04text\"\x8d\x02\n" +
+ "\x04text\x18\x01 \x01(\tR\x04text\"*\n" +
+ "\x12SubmitFilesRequest\x12\x14\n" +
+ "\x05paths\x18\x01 \x03(\tR\x05paths\"\x8d\x02\n" +
"\x0eWebShareStatus\x12\x18\n" +
"\aenabled\x18\x01 \x01(\bR\aenabled\x12\x1c\n" +
"\tlistening\x18\x02 \x01(\bR\tlistening\x12\x12\n" +
@@ -6995,7 +7041,7 @@ const file_pasteferry_v1_daemon_proto_rawDesc = "" +
"\x11TransferDirection\x12\"\n" +
"\x1eTRANSFER_DIRECTION_UNSPECIFIED\x10\x00\x12\x1f\n" +
"\x1bTRANSFER_DIRECTION_OUTGOING\x10\x01\x12\x1f\n" +
- "\x1bTRANSFER_DIRECTION_INCOMING\x10\x022\x84&\n" +
+ "\x1bTRANSFER_DIRECTION_INCOMING\x10\x022\xd1&\n" +
"\rDaemonService\x12D\n" +
"\tSubscribe\x12\x1f.pasteferry.v1.SubscribeRequest\x1a\x14.pasteferry.v1.Event0\x01\x12T\n" +
"\vListHistory\x12!.pasteferry.v1.ListHistoryRequest\x1a\".pasteferry.v1.ListHistoryResponse\x12J\n" +
@@ -7056,7 +7102,8 @@ const file_pasteferry_v1_daemon_proto_rawDesc = "" +
"\x13SetFriendAutoAccept\x12).pasteferry.v1.SetFriendAutoAcceptRequest\x1a\x15.pasteferry.v1.Friend\x12=\n" +
"\vBlockDevice\x12\x18.pasteferry.v1.FriendRef\x1a\x14.pasteferry.v1.Empty\x12I\n" +
"\n" +
- "SubmitText\x12 .pasteferry.v1.SubmitTextRequest\x1a\x19.pasteferry.v1.ClipRecord\x12B\n" +
+ "SubmitText\x12 .pasteferry.v1.SubmitTextRequest\x1a\x19.pasteferry.v1.ClipRecord\x12K\n" +
+ "\vSubmitFiles\x12!.pasteferry.v1.SubmitFilesRequest\x1a\x19.pasteferry.v1.ClipRecord\x12B\n" +
"\vGetWebShare\x12\x14.pasteferry.v1.Empty\x1a\x1d.pasteferry.v1.WebShareStatus\x12O\n" +
"\vSetWebShare\x12!.pasteferry.v1.SetWebShareRequest\x1a\x1d.pasteferry.v1.WebShareStatus\x12[\n" +
"\x11NewWebShareInvite\x12'.pasteferry.v1.NewWebShareInviteRequest\x1a\x1d.pasteferry.v1.WebShareInvite\x12M\n" +
@@ -7079,7 +7126,7 @@ func file_pasteferry_v1_daemon_proto_rawDescGZIP() []byte {
}
var file_pasteferry_v1_daemon_proto_enumTypes = make([]protoimpl.EnumInfo, 7)
-var file_pasteferry_v1_daemon_proto_msgTypes = make([]protoimpl.MessageInfo, 82)
+var file_pasteferry_v1_daemon_proto_msgTypes = make([]protoimpl.MessageInfo, 83)
var file_pasteferry_v1_daemon_proto_goTypes = []any{
(ClipKind)(0), // 0: pasteferry.v1.ClipKind
(ClipStatus)(0), // 1: pasteferry.v1.ClipStatus
@@ -7163,13 +7210,14 @@ var file_pasteferry_v1_daemon_proto_goTypes = []any{
(*CheckReceiveDirRequest)(nil), // 79: pasteferry.v1.CheckReceiveDirRequest
(*CheckReceiveDirResponse)(nil), // 80: pasteferry.v1.CheckReceiveDirResponse
(*SubmitTextRequest)(nil), // 81: pasteferry.v1.SubmitTextRequest
- (*WebShareStatus)(nil), // 82: pasteferry.v1.WebShareStatus
- (*WebSession)(nil), // 83: pasteferry.v1.WebSession
- (*SetWebShareRequest)(nil), // 84: pasteferry.v1.SetWebShareRequest
- (*NewWebShareInviteRequest)(nil), // 85: pasteferry.v1.NewWebShareInviteRequest
- (*WebShareInvite)(nil), // 86: pasteferry.v1.WebShareInvite
- (*WebShareInviteRef)(nil), // 87: pasteferry.v1.WebShareInviteRef
- (*WebSessionRef)(nil), // 88: pasteferry.v1.WebSessionRef
+ (*SubmitFilesRequest)(nil), // 82: pasteferry.v1.SubmitFilesRequest
+ (*WebShareStatus)(nil), // 83: pasteferry.v1.WebShareStatus
+ (*WebSession)(nil), // 84: pasteferry.v1.WebSession
+ (*SetWebShareRequest)(nil), // 85: pasteferry.v1.SetWebShareRequest
+ (*NewWebShareInviteRequest)(nil), // 86: pasteferry.v1.NewWebShareInviteRequest
+ (*WebShareInvite)(nil), // 87: pasteferry.v1.WebShareInvite
+ (*WebShareInviteRef)(nil), // 88: pasteferry.v1.WebShareInviteRef
+ (*WebSessionRef)(nil), // 89: pasteferry.v1.WebSessionRef
}
var file_pasteferry_v1_daemon_proto_depIdxs = []int32{
0, // 0: pasteferry.v1.ClipRecord.kind:type_name -> pasteferry.v1.ClipKind
@@ -7189,7 +7237,7 @@ var file_pasteferry_v1_daemon_proto_depIdxs = []int32{
21, // 14: pasteferry.v1.Event.friend_changed:type_name -> pasteferry.v1.Friend
23, // 15: pasteferry.v1.Event.friend_request:type_name -> pasteferry.v1.FriendRequest
14, // 16: pasteferry.v1.Event.profile_changed:type_name -> pasteferry.v1.Profile
- 82, // 17: pasteferry.v1.Event.web_share_changed:type_name -> pasteferry.v1.WebShareStatus
+ 83, // 17: pasteferry.v1.Event.web_share_changed:type_name -> pasteferry.v1.WebShareStatus
2, // 18: pasteferry.v1.Friend.connection:type_name -> pasteferry.v1.ConnectionKind
21, // 19: pasteferry.v1.ListFriendsResponse.friends:type_name -> pasteferry.v1.Friend
24, // 20: pasteferry.v1.Strangers.strangers:type_name -> pasteferry.v1.Stranger
@@ -7214,7 +7262,7 @@ var file_pasteferry_v1_daemon_proto_depIdxs = []int32{
6, // 39: pasteferry.v1.ListTransfersRequest.direction:type_name -> pasteferry.v1.TransferDirection
74, // 40: pasteferry.v1.ListTransfersResponse.transfers:type_name -> pasteferry.v1.Transfer
6, // 41: pasteferry.v1.DeleteTransfersRequest.direction:type_name -> pasteferry.v1.TransferDirection
- 83, // 42: pasteferry.v1.WebShareStatus.sessions:type_name -> pasteferry.v1.WebSession
+ 84, // 42: pasteferry.v1.WebShareStatus.sessions:type_name -> pasteferry.v1.WebSession
10, // 43: pasteferry.v1.DaemonService.Subscribe:input_type -> pasteferry.v1.SubscribeRequest
30, // 44: pasteferry.v1.DaemonService.ListHistory:input_type -> pasteferry.v1.ListHistoryRequest
32, // 45: pasteferry.v1.DaemonService.DeleteHistory:input_type -> pasteferry.v1.DeleteHistoryRequest
@@ -7271,78 +7319,80 @@ var file_pasteferry_v1_daemon_proto_depIdxs = []int32{
20, // 96: pasteferry.v1.DaemonService.SetFriendAutoAccept:input_type -> pasteferry.v1.SetFriendAutoAcceptRequest
19, // 97: pasteferry.v1.DaemonService.BlockDevice:input_type -> pasteferry.v1.FriendRef
81, // 98: pasteferry.v1.DaemonService.SubmitText:input_type -> pasteferry.v1.SubmitTextRequest
- 7, // 99: pasteferry.v1.DaemonService.GetWebShare:input_type -> pasteferry.v1.Empty
- 84, // 100: pasteferry.v1.DaemonService.SetWebShare:input_type -> pasteferry.v1.SetWebShareRequest
- 85, // 101: pasteferry.v1.DaemonService.NewWebShareInvite:input_type -> pasteferry.v1.NewWebShareInviteRequest
- 87, // 102: pasteferry.v1.DaemonService.CloseWebShareInvite:input_type -> pasteferry.v1.WebShareInviteRef
- 88, // 103: pasteferry.v1.DaemonService.RemoveWebSession:input_type -> pasteferry.v1.WebSessionRef
- 7, // 104: pasteferry.v1.DaemonService.PasteFiles:input_type -> pasteferry.v1.Empty
- 7, // 105: pasteferry.v1.DaemonService.WatchStrangers:input_type -> pasteferry.v1.Empty
- 13, // 106: pasteferry.v1.DaemonService.Subscribe:output_type -> pasteferry.v1.Event
- 31, // 107: pasteferry.v1.DaemonService.ListHistory:output_type -> pasteferry.v1.ListHistoryResponse
- 7, // 108: pasteferry.v1.DaemonService.DeleteHistory:output_type -> pasteferry.v1.Empty
- 7, // 109: pasteferry.v1.DaemonService.Fetch:output_type -> pasteferry.v1.Empty
- 7, // 110: pasteferry.v1.DaemonService.ApplyToClipboard:output_type -> pasteferry.v1.Empty
- 71, // 111: pasteferry.v1.DaemonService.GetImagePreview:output_type -> pasteferry.v1.GetImagePreviewResponse
- 41, // 112: pasteferry.v1.DaemonService.ListDevices:output_type -> pasteferry.v1.ListDevicesResponse
- 42, // 113: pasteferry.v1.DaemonService.CreatePairingCode:output_type -> pasteferry.v1.CreatePairingCodeResponse
- 44, // 114: pasteferry.v1.DaemonService.RedeemPairingCode:output_type -> pasteferry.v1.RedeemPairingCodeResponse
- 7, // 115: pasteferry.v1.DaemonService.ConfirmPairing:output_type -> pasteferry.v1.Empty
- 7, // 116: pasteferry.v1.DaemonService.Unpair:output_type -> pasteferry.v1.Empty
- 51, // 117: pasteferry.v1.DaemonService.Reconnect:output_type -> pasteferry.v1.ReconnectResponse
- 7, // 118: pasteferry.v1.DaemonService.SetDeviceAddress:output_type -> pasteferry.v1.Empty
- 47, // 119: pasteferry.v1.DaemonService.WatchNearby:output_type -> pasteferry.v1.NearbyDevices
- 44, // 120: pasteferry.v1.DaemonService.PairNearby:output_type -> pasteferry.v1.RedeemPairingCodeResponse
- 53, // 121: pasteferry.v1.DaemonService.GetConfig:output_type -> pasteferry.v1.Config
- 53, // 122: pasteferry.v1.DaemonService.UpdateConfig:output_type -> pasteferry.v1.Config
- 59, // 123: pasteferry.v1.DaemonService.GetStatus:output_type -> pasteferry.v1.Status
- 7, // 124: pasteferry.v1.DaemonService.RequestClipboardPermission:output_type -> pasteferry.v1.Empty
- 7, // 125: pasteferry.v1.DaemonService.RequestLocalNetworkPermission:output_type -> pasteferry.v1.Empty
- 27, // 126: pasteferry.v1.DaemonService.GetNotificationStatus:output_type -> pasteferry.v1.NotificationStatus
- 27, // 127: pasteferry.v1.DaemonService.RequestNotificationPermission:output_type -> pasteferry.v1.NotificationStatus
- 7, // 128: pasteferry.v1.DaemonService.ActivateNotification:output_type -> pasteferry.v1.Empty
- 55, // 129: pasteferry.v1.DaemonService.GetNetwork:output_type -> pasteferry.v1.NetworkInfo
- 68, // 130: pasteferry.v1.DaemonService.ExportDiagnostics:output_type -> pasteferry.v1.Diagnostics
- 59, // 131: pasteferry.v1.DaemonService.SetVerboseLog:output_type -> pasteferry.v1.Status
- 62, // 132: pasteferry.v1.DaemonService.CheckForUpdate:output_type -> pasteferry.v1.UpdateInfo
- 64, // 133: pasteferry.v1.DaemonService.DownloadUpdate:output_type -> pasteferry.v1.UpdateProgress
- 7, // 134: pasteferry.v1.DaemonService.InstallUpdate:output_type -> pasteferry.v1.Empty
- 9, // 135: pasteferry.v1.DaemonService.SetFavorite:output_type -> pasteferry.v1.ClipRecord
- 38, // 136: pasteferry.v1.DaemonService.GetClipDetail:output_type -> pasteferry.v1.ClipDetail
- 9, // 137: pasteferry.v1.DaemonService.SetAlias:output_type -> pasteferry.v1.ClipRecord
- 40, // 138: pasteferry.v1.DaemonService.QuickPasteSession:output_type -> pasteferry.v1.QuickPasteCommand
- 39, // 139: pasteferry.v1.DaemonService.GetQuickPasteStatus:output_type -> pasteferry.v1.QuickPasteStatus
- 7, // 140: pasteferry.v1.DaemonService.SendQuickPasteCommand:output_type -> pasteferry.v1.Empty
- 74, // 141: pasteferry.v1.DaemonService.SendFiles:output_type -> pasteferry.v1.Transfer
- 7, // 142: pasteferry.v1.DaemonService.CancelTransfer:output_type -> pasteferry.v1.Empty
- 7, // 143: pasteferry.v1.DaemonService.ResumeTransfer:output_type -> pasteferry.v1.Empty
- 77, // 144: pasteferry.v1.DaemonService.ListTransfers:output_type -> pasteferry.v1.ListTransfersResponse
- 7, // 145: pasteferry.v1.DaemonService.DeleteTransfers:output_type -> pasteferry.v1.Empty
- 7, // 146: pasteferry.v1.DaemonService.MarkTransfersSeen:output_type -> pasteferry.v1.Empty
- 80, // 147: pasteferry.v1.DaemonService.CheckReceiveDir:output_type -> pasteferry.v1.CheckReceiveDirResponse
- 7, // 148: pasteferry.v1.DaemonService.AnswerIncoming:output_type -> pasteferry.v1.Empty
- 14, // 149: pasteferry.v1.DaemonService.GetProfile:output_type -> pasteferry.v1.Profile
- 14, // 150: pasteferry.v1.DaemonService.SetDisplayName:output_type -> pasteferry.v1.Profile
- 14, // 151: pasteferry.v1.DaemonService.SetAvatar:output_type -> pasteferry.v1.Profile
- 14, // 152: pasteferry.v1.DaemonService.ResetAvatar:output_type -> pasteferry.v1.Profile
- 18, // 153: pasteferry.v1.DaemonService.GetAvatar:output_type -> pasteferry.v1.Avatar
- 42, // 154: pasteferry.v1.DaemonService.CreateFriendCode:output_type -> pasteferry.v1.CreatePairingCodeResponse
- 23, // 155: pasteferry.v1.DaemonService.RedeemFriendCode:output_type -> pasteferry.v1.FriendRequest
- 7, // 156: pasteferry.v1.DaemonService.ConfirmFriend:output_type -> pasteferry.v1.Empty
- 22, // 157: pasteferry.v1.DaemonService.ListFriends:output_type -> pasteferry.v1.ListFriendsResponse
- 7, // 158: pasteferry.v1.DaemonService.RemoveFriend:output_type -> pasteferry.v1.Empty
- 21, // 159: pasteferry.v1.DaemonService.SetFriendAutoAccept:output_type -> pasteferry.v1.Friend
- 7, // 160: pasteferry.v1.DaemonService.BlockDevice:output_type -> pasteferry.v1.Empty
- 9, // 161: pasteferry.v1.DaemonService.SubmitText:output_type -> pasteferry.v1.ClipRecord
- 82, // 162: pasteferry.v1.DaemonService.GetWebShare:output_type -> pasteferry.v1.WebShareStatus
- 82, // 163: pasteferry.v1.DaemonService.SetWebShare:output_type -> pasteferry.v1.WebShareStatus
- 86, // 164: pasteferry.v1.DaemonService.NewWebShareInvite:output_type -> pasteferry.v1.WebShareInvite
- 7, // 165: pasteferry.v1.DaemonService.CloseWebShareInvite:output_type -> pasteferry.v1.Empty
- 82, // 166: pasteferry.v1.DaemonService.RemoveWebSession:output_type -> pasteferry.v1.WebShareStatus
- 26, // 167: pasteferry.v1.DaemonService.PasteFiles:output_type -> pasteferry.v1.PasteFilesResponse
- 25, // 168: pasteferry.v1.DaemonService.WatchStrangers:output_type -> pasteferry.v1.Strangers
- 106, // [106:169] is the sub-list for method output_type
- 43, // [43:106] is the sub-list for method input_type
+ 82, // 99: pasteferry.v1.DaemonService.SubmitFiles:input_type -> pasteferry.v1.SubmitFilesRequest
+ 7, // 100: pasteferry.v1.DaemonService.GetWebShare:input_type -> pasteferry.v1.Empty
+ 85, // 101: pasteferry.v1.DaemonService.SetWebShare:input_type -> pasteferry.v1.SetWebShareRequest
+ 86, // 102: pasteferry.v1.DaemonService.NewWebShareInvite:input_type -> pasteferry.v1.NewWebShareInviteRequest
+ 88, // 103: pasteferry.v1.DaemonService.CloseWebShareInvite:input_type -> pasteferry.v1.WebShareInviteRef
+ 89, // 104: pasteferry.v1.DaemonService.RemoveWebSession:input_type -> pasteferry.v1.WebSessionRef
+ 7, // 105: pasteferry.v1.DaemonService.PasteFiles:input_type -> pasteferry.v1.Empty
+ 7, // 106: pasteferry.v1.DaemonService.WatchStrangers:input_type -> pasteferry.v1.Empty
+ 13, // 107: pasteferry.v1.DaemonService.Subscribe:output_type -> pasteferry.v1.Event
+ 31, // 108: pasteferry.v1.DaemonService.ListHistory:output_type -> pasteferry.v1.ListHistoryResponse
+ 7, // 109: pasteferry.v1.DaemonService.DeleteHistory:output_type -> pasteferry.v1.Empty
+ 7, // 110: pasteferry.v1.DaemonService.Fetch:output_type -> pasteferry.v1.Empty
+ 7, // 111: pasteferry.v1.DaemonService.ApplyToClipboard:output_type -> pasteferry.v1.Empty
+ 71, // 112: pasteferry.v1.DaemonService.GetImagePreview:output_type -> pasteferry.v1.GetImagePreviewResponse
+ 41, // 113: pasteferry.v1.DaemonService.ListDevices:output_type -> pasteferry.v1.ListDevicesResponse
+ 42, // 114: pasteferry.v1.DaemonService.CreatePairingCode:output_type -> pasteferry.v1.CreatePairingCodeResponse
+ 44, // 115: pasteferry.v1.DaemonService.RedeemPairingCode:output_type -> pasteferry.v1.RedeemPairingCodeResponse
+ 7, // 116: pasteferry.v1.DaemonService.ConfirmPairing:output_type -> pasteferry.v1.Empty
+ 7, // 117: pasteferry.v1.DaemonService.Unpair:output_type -> pasteferry.v1.Empty
+ 51, // 118: pasteferry.v1.DaemonService.Reconnect:output_type -> pasteferry.v1.ReconnectResponse
+ 7, // 119: pasteferry.v1.DaemonService.SetDeviceAddress:output_type -> pasteferry.v1.Empty
+ 47, // 120: pasteferry.v1.DaemonService.WatchNearby:output_type -> pasteferry.v1.NearbyDevices
+ 44, // 121: pasteferry.v1.DaemonService.PairNearby:output_type -> pasteferry.v1.RedeemPairingCodeResponse
+ 53, // 122: pasteferry.v1.DaemonService.GetConfig:output_type -> pasteferry.v1.Config
+ 53, // 123: pasteferry.v1.DaemonService.UpdateConfig:output_type -> pasteferry.v1.Config
+ 59, // 124: pasteferry.v1.DaemonService.GetStatus:output_type -> pasteferry.v1.Status
+ 7, // 125: pasteferry.v1.DaemonService.RequestClipboardPermission:output_type -> pasteferry.v1.Empty
+ 7, // 126: pasteferry.v1.DaemonService.RequestLocalNetworkPermission:output_type -> pasteferry.v1.Empty
+ 27, // 127: pasteferry.v1.DaemonService.GetNotificationStatus:output_type -> pasteferry.v1.NotificationStatus
+ 27, // 128: pasteferry.v1.DaemonService.RequestNotificationPermission:output_type -> pasteferry.v1.NotificationStatus
+ 7, // 129: pasteferry.v1.DaemonService.ActivateNotification:output_type -> pasteferry.v1.Empty
+ 55, // 130: pasteferry.v1.DaemonService.GetNetwork:output_type -> pasteferry.v1.NetworkInfo
+ 68, // 131: pasteferry.v1.DaemonService.ExportDiagnostics:output_type -> pasteferry.v1.Diagnostics
+ 59, // 132: pasteferry.v1.DaemonService.SetVerboseLog:output_type -> pasteferry.v1.Status
+ 62, // 133: pasteferry.v1.DaemonService.CheckForUpdate:output_type -> pasteferry.v1.UpdateInfo
+ 64, // 134: pasteferry.v1.DaemonService.DownloadUpdate:output_type -> pasteferry.v1.UpdateProgress
+ 7, // 135: pasteferry.v1.DaemonService.InstallUpdate:output_type -> pasteferry.v1.Empty
+ 9, // 136: pasteferry.v1.DaemonService.SetFavorite:output_type -> pasteferry.v1.ClipRecord
+ 38, // 137: pasteferry.v1.DaemonService.GetClipDetail:output_type -> pasteferry.v1.ClipDetail
+ 9, // 138: pasteferry.v1.DaemonService.SetAlias:output_type -> pasteferry.v1.ClipRecord
+ 40, // 139: pasteferry.v1.DaemonService.QuickPasteSession:output_type -> pasteferry.v1.QuickPasteCommand
+ 39, // 140: pasteferry.v1.DaemonService.GetQuickPasteStatus:output_type -> pasteferry.v1.QuickPasteStatus
+ 7, // 141: pasteferry.v1.DaemonService.SendQuickPasteCommand:output_type -> pasteferry.v1.Empty
+ 74, // 142: pasteferry.v1.DaemonService.SendFiles:output_type -> pasteferry.v1.Transfer
+ 7, // 143: pasteferry.v1.DaemonService.CancelTransfer:output_type -> pasteferry.v1.Empty
+ 7, // 144: pasteferry.v1.DaemonService.ResumeTransfer:output_type -> pasteferry.v1.Empty
+ 77, // 145: pasteferry.v1.DaemonService.ListTransfers:output_type -> pasteferry.v1.ListTransfersResponse
+ 7, // 146: pasteferry.v1.DaemonService.DeleteTransfers:output_type -> pasteferry.v1.Empty
+ 7, // 147: pasteferry.v1.DaemonService.MarkTransfersSeen:output_type -> pasteferry.v1.Empty
+ 80, // 148: pasteferry.v1.DaemonService.CheckReceiveDir:output_type -> pasteferry.v1.CheckReceiveDirResponse
+ 7, // 149: pasteferry.v1.DaemonService.AnswerIncoming:output_type -> pasteferry.v1.Empty
+ 14, // 150: pasteferry.v1.DaemonService.GetProfile:output_type -> pasteferry.v1.Profile
+ 14, // 151: pasteferry.v1.DaemonService.SetDisplayName:output_type -> pasteferry.v1.Profile
+ 14, // 152: pasteferry.v1.DaemonService.SetAvatar:output_type -> pasteferry.v1.Profile
+ 14, // 153: pasteferry.v1.DaemonService.ResetAvatar:output_type -> pasteferry.v1.Profile
+ 18, // 154: pasteferry.v1.DaemonService.GetAvatar:output_type -> pasteferry.v1.Avatar
+ 42, // 155: pasteferry.v1.DaemonService.CreateFriendCode:output_type -> pasteferry.v1.CreatePairingCodeResponse
+ 23, // 156: pasteferry.v1.DaemonService.RedeemFriendCode:output_type -> pasteferry.v1.FriendRequest
+ 7, // 157: pasteferry.v1.DaemonService.ConfirmFriend:output_type -> pasteferry.v1.Empty
+ 22, // 158: pasteferry.v1.DaemonService.ListFriends:output_type -> pasteferry.v1.ListFriendsResponse
+ 7, // 159: pasteferry.v1.DaemonService.RemoveFriend:output_type -> pasteferry.v1.Empty
+ 21, // 160: pasteferry.v1.DaemonService.SetFriendAutoAccept:output_type -> pasteferry.v1.Friend
+ 7, // 161: pasteferry.v1.DaemonService.BlockDevice:output_type -> pasteferry.v1.Empty
+ 9, // 162: pasteferry.v1.DaemonService.SubmitText:output_type -> pasteferry.v1.ClipRecord
+ 9, // 163: pasteferry.v1.DaemonService.SubmitFiles:output_type -> pasteferry.v1.ClipRecord
+ 83, // 164: pasteferry.v1.DaemonService.GetWebShare:output_type -> pasteferry.v1.WebShareStatus
+ 83, // 165: pasteferry.v1.DaemonService.SetWebShare:output_type -> pasteferry.v1.WebShareStatus
+ 87, // 166: pasteferry.v1.DaemonService.NewWebShareInvite:output_type -> pasteferry.v1.WebShareInvite
+ 7, // 167: pasteferry.v1.DaemonService.CloseWebShareInvite:output_type -> pasteferry.v1.Empty
+ 83, // 168: pasteferry.v1.DaemonService.RemoveWebSession:output_type -> pasteferry.v1.WebShareStatus
+ 26, // 169: pasteferry.v1.DaemonService.PasteFiles:output_type -> pasteferry.v1.PasteFilesResponse
+ 25, // 170: pasteferry.v1.DaemonService.WatchStrangers:output_type -> pasteferry.v1.Strangers
+ 107, // [107:171] is the sub-list for method output_type
+ 43, // [43:107] is the sub-list for method input_type
43, // [43:43] is the sub-list for extension type_name
43, // [43:43] is the sub-list for extension extendee
0, // [0:43] is the sub-list for field type_name
@@ -7379,7 +7429,7 @@ func file_pasteferry_v1_daemon_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_pasteferry_v1_daemon_proto_rawDesc), len(file_pasteferry_v1_daemon_proto_rawDesc)),
NumEnums: 7,
- NumMessages: 82,
+ NumMessages: 83,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/proto/gen/pasteferry/v1/daemon_grpc.pb.go b/proto/gen/pasteferry/v1/daemon_grpc.pb.go
index f87cd1d..8e35ac6 100644
--- a/proto/gen/pasteferry/v1/daemon_grpc.pb.go
+++ b/proto/gen/pasteferry/v1/daemon_grpc.pb.go
@@ -80,6 +80,7 @@ const (
DaemonService_SetFriendAutoAccept_FullMethodName = "/pasteferry.v1.DaemonService/SetFriendAutoAccept"
DaemonService_BlockDevice_FullMethodName = "/pasteferry.v1.DaemonService/BlockDevice"
DaemonService_SubmitText_FullMethodName = "/pasteferry.v1.DaemonService/SubmitText"
+ DaemonService_SubmitFiles_FullMethodName = "/pasteferry.v1.DaemonService/SubmitFiles"
DaemonService_GetWebShare_FullMethodName = "/pasteferry.v1.DaemonService/GetWebShare"
DaemonService_SetWebShare_FullMethodName = "/pasteferry.v1.DaemonService/SetWebShare"
DaemonService_NewWebShareInvite_FullMethodName = "/pasteferry.v1.DaemonService/NewWebShareInvite"
@@ -198,6 +199,8 @@ type DaemonServiceClient interface {
BlockDevice(ctx context.Context, in *FriendRef, opts ...grpc.CallOption) (*Empty, error)
// 发送页里输入的文字:当成本机复制,落库并发给其他设备,不写本机剪贴板(Android App,design/phone-sync.md 3.3.2 节)
SubmitText(ctx context.Context, in *SubmitTextRequest, opts ...grpc.CallOption) (*ClipRecord, error)
+ // 发送页里选的照片和文件:路径由 App 拷到自己的缓存目录后传过来,同样当成本机复制
+ SubmitFiles(ctx context.Context, in *SubmitFilesRequest, opts ...grpc.CallOption) (*ClipRecord, error)
// 手机网页传输(design/phone-sync.md 第 2 节):手机扫码后用浏览器和本机互传
GetWebShare(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*WebShareStatus, error)
// 打开或关闭总开关。关闭时停止监听端口,已登记的手机保留
@@ -812,6 +815,16 @@ func (c *daemonServiceClient) SubmitText(ctx context.Context, in *SubmitTextRequ
return out, nil
}
+func (c *daemonServiceClient) SubmitFiles(ctx context.Context, in *SubmitFilesRequest, opts ...grpc.CallOption) (*ClipRecord, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(ClipRecord)
+ err := c.cc.Invoke(ctx, DaemonService_SubmitFiles_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *daemonServiceClient) GetWebShare(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*WebShareStatus, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(WebShareStatus)
@@ -1000,6 +1013,8 @@ type DaemonServiceServer interface {
BlockDevice(context.Context, *FriendRef) (*Empty, error)
// 发送页里输入的文字:当成本机复制,落库并发给其他设备,不写本机剪贴板(Android App,design/phone-sync.md 3.3.2 节)
SubmitText(context.Context, *SubmitTextRequest) (*ClipRecord, error)
+ // 发送页里选的照片和文件:路径由 App 拷到自己的缓存目录后传过来,同样当成本机复制
+ SubmitFiles(context.Context, *SubmitFilesRequest) (*ClipRecord, error)
// 手机网页传输(design/phone-sync.md 第 2 节):手机扫码后用浏览器和本机互传
GetWebShare(context.Context, *Empty) (*WebShareStatus, error)
// 打开或关闭总开关。关闭时停止监听端口,已登记的手机保留
@@ -1192,6 +1207,9 @@ func (UnimplementedDaemonServiceServer) BlockDevice(context.Context, *FriendRef)
func (UnimplementedDaemonServiceServer) SubmitText(context.Context, *SubmitTextRequest) (*ClipRecord, error) {
return nil, status.Error(codes.Unimplemented, "method SubmitText not implemented")
}
+func (UnimplementedDaemonServiceServer) SubmitFiles(context.Context, *SubmitFilesRequest) (*ClipRecord, error) {
+ return nil, status.Error(codes.Unimplemented, "method SubmitFiles not implemented")
+}
func (UnimplementedDaemonServiceServer) GetWebShare(context.Context, *Empty) (*WebShareStatus, error) {
return nil, status.Error(codes.Unimplemented, "method GetWebShare not implemented")
}
@@ -2210,6 +2228,24 @@ func _DaemonService_SubmitText_Handler(srv interface{}, ctx context.Context, dec
return interceptor(ctx, in, info, handler)
}
+func _DaemonService_SubmitFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(SubmitFilesRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(DaemonServiceServer).SubmitFiles(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: DaemonService_SubmitFiles_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(DaemonServiceServer).SubmitFiles(ctx, req.(*SubmitFilesRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
func _DaemonService_GetWebShare_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(Empty)
if err := dec(in); err != nil {
@@ -2544,6 +2580,10 @@ var DaemonService_ServiceDesc = grpc.ServiceDesc{
MethodName: "SubmitText",
Handler: _DaemonService_SubmitText_Handler,
},
+ {
+ MethodName: "SubmitFiles",
+ Handler: _DaemonService_SubmitFiles_Handler,
+ },
{
MethodName: "GetWebShare",
Handler: _DaemonService_GetWebShare_Handler,
diff --git a/proto/pasteferry/v1/daemon.proto b/proto/pasteferry/v1/daemon.proto
index f24e0e5..82bfeab 100644
--- a/proto/pasteferry/v1/daemon.proto
+++ b/proto/pasteferry/v1/daemon.proto
@@ -130,6 +130,9 @@ service DaemonService {
// 发送页里输入的文字:当成本机复制,落库并发给其他设备,不写本机剪贴板(Android App,design/phone-sync.md 3.3.2 节)
rpc SubmitText(SubmitTextRequest) returns (ClipRecord);
+ // 发送页里选的照片和文件:路径由 App 拷到自己的缓存目录后传过来,同样当成本机复制
+ rpc SubmitFiles(SubmitFilesRequest) returns (ClipRecord);
+
// 手机网页传输(design/phone-sync.md 第 2 节):手机扫码后用浏览器和本机互传
rpc GetWebShare(Empty) returns (WebShareStatus);
// 打开或关闭总开关。关闭时停止监听端口,已登记的手机保留
@@ -921,6 +924,10 @@ message SubmitTextRequest {
string text = 1;
}
+message SubmitFilesRequest {
+ repeated string paths = 1;
+}
+
// ─────────────────────────── 手机网页传输 ───────────────────────────
message WebShareStatus {
diff --git a/scripts/gitee-mirror.sh b/scripts/gitee-mirror.sh
index d3e89dd..c3a443e 100755
--- a/scripts/gitee-mirror.sh
+++ b/scripts/gitee-mirror.sh
@@ -3,7 +3,7 @@
#
# 1. 推送 GitHub 上的 main 与本地全部 tag
# 2. 建与 GitHub Release 同名、同正文的发行版
-# 3. 上传 release/ 里的 14 个文件(已有的同名文件跳过,可以重复运行)
+# 3. 上传 release/ 里的 15 个文件(含 Android APK;已有的同名文件跳过,可以重复运行)
# 4. 只保留最近 KEEP 个发行版的附件:Gitee 每个仓库的附件总共只有 1 GB,一版约 270 MB
#
# ./scripts/gitee-mirror.sh vX.Y.Z "PasteFerry X.Y.Z — Summary" <正文文件>
@@ -27,7 +27,7 @@ KEEP=${KEEP:-2}
API=https://gitee.com/api/v5/repos/$OWNER/$REPO
TOKEN=$(security find-generic-password -s pasteferry-gitee-token -w)
-[[ $(find release -maxdepth 1 -type f | wc -l) -eq 14 ]] || { echo "release/ 里应当正好有 14 个文件" >&2; exit 1; }
+[[ $(find release -maxdepth 1 -type f | wc -l) -eq 15 ]] || { echo "release/ 里应当正好有 15 个文件" >&2; exit 1; }
git rev-parse -q --verify "refs/tags/$TAG^{commit}" >/dev/null || { echo "本地没有 tag $TAG" >&2; exit 1; }
[[ -f $NOTES ]] || { echo "找不到正文文件 $NOTES" >&2; exit 1; }
diff --git a/ui/lib/app_state.dart b/ui/lib/app_state.dart
index bb526d9..e4b87f4 100644
--- a/ui/lib/app_state.dart
+++ b/ui/lib/app_state.dart
@@ -1361,6 +1361,14 @@ class AppState extends ChangeNotifier implements RecordDetails {
return r;
}
+ /// 发送页里选的照片和文件:路径要先拷到本应用的缓存目录,后台服务才读得到。
+ Future<ClipRecord> submitFiles(List<String> paths) async {
+ final r = await _client.submitFiles(SubmitFilesRequest(paths: paths));
+ _upsert(r);
+ notifyListeners();
+ return r;
+ }
+
/// 一条记录里第 [index] 张图片:本机路径、文件名,以及能预览的图片总数。
/// HEIC 这类格式由后台服务先转换,大图可能要一两秒,超时放宽一些。
@override
diff --git a/ui/lib/gen/pasteferry/v1/daemon.pb.dart b/ui/lib/gen/pasteferry/v1/daemon.pb.dart
index 446d173..0bd79eb 100644
--- a/ui/lib/gen/pasteferry/v1/daemon.pb.dart
+++ b/ui/lib/gen/pasteferry/v1/daemon.pb.dart
@@ -7508,6 +7508,57 @@ class SubmitTextRequest extends $pb.GeneratedMessage {
void clearText() => $_clearField(1);
}
+class SubmitFilesRequest extends $pb.GeneratedMessage {
+ factory SubmitFilesRequest({
+ $core.Iterable<$core.String>? paths,
+ }) {
+ final result = SubmitFilesRequest._();
+ if (paths != null) result.paths.addAll(paths);
+ return result;
+ }
+
+ SubmitFilesRequest._();
+
+ factory SubmitFilesRequest.fromBuffer($core.List<$core.int> data,
+ [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+ SubmitFilesRequest()..mergeFromBuffer(data, registry);
+ factory SubmitFilesRequest.fromJson($core.String json,
+ [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+ SubmitFilesRequest()..mergeFromJson(json, registry);
+
+ static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+ _omitMessageNames ? '' : 'SubmitFilesRequest',
+ package: const $pb.PackageName(_omitMessageNames ? '' : 'pasteferry.v1'),
+ createEmptyInstance: SubmitFilesRequest.$_createMessage)
+ ..pPS(1, _omitFieldNames ? '' : 'paths')
+ ..hasRequiredFields = false;
+
+ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+ SubmitFilesRequest clone() => deepCopy();
+ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+ SubmitFilesRequest copyWith(void Function(SubmitFilesRequest) updates) =>
+ super.copyWith((message) => updates(message as SubmitFilesRequest))
+ as SubmitFilesRequest;
+
+ @$core.override
+ $pb.BuilderInfo get info_ => _i;
+
+ @$core.pragma('dart2js:noInline')
+ @$core.Deprecated('Use SubmitFilesRequest() / SubmitFilesRequest.new instead')
+ static SubmitFilesRequest create() => SubmitFilesRequest._();
+ static $pb.GeneratedMessage $_createMessage() => SubmitFilesRequest._();
+ @$core.override
+ SubmitFilesRequest createEmptyInstance() => SubmitFilesRequest._();
+ @$core.pragma('dart2js:noInline')
+ static SubmitFilesRequest getDefault() => _defaultInstance ??=
+ $pb.GeneratedMessage.$_defaultFor<SubmitFilesRequest>(
+ SubmitFilesRequest.$_createMessage);
+ static SubmitFilesRequest? _defaultInstance;
+
+ @$pb.TagNumber(1)
+ $pb.PbList<$core.String> get paths => $_getList(0);
+}
+
class WebShareStatus extends $pb.GeneratedMessage {
factory WebShareStatus({
$core.bool? enabled,
diff --git a/ui/lib/gen/pasteferry/v1/daemon.pbgrpc.dart b/ui/lib/gen/pasteferry/v1/daemon.pbgrpc.dart
index 33195b3..06d013a 100644
--- a/ui/lib/gen/pasteferry/v1/daemon.pbgrpc.dart
+++ b/ui/lib/gen/pasteferry/v1/daemon.pbgrpc.dart
@@ -482,6 +482,14 @@ class DaemonServiceClient extends $grpc.Client {
return $createUnaryCall(_$submitText, request, options: options);
}
+ /// 发送页里选的照片和文件:路径由 App 拷到自己的缓存目录后传过来,同样当成本机复制
+ $grpc.ResponseFuture<$0.ClipRecord> submitFiles(
+ $0.SubmitFilesRequest request, {
+ $grpc.CallOptions? options,
+ }) {
+ return $createUnaryCall(_$submitFiles, request, options: options);
+ }
+
/// 手机网页传输(design/phone-sync.md 第 2 节):手机扫码后用浏览器和本机互传
$grpc.ResponseFuture<$0.WebShareStatus> getWebShare(
$0.Empty request, {
@@ -806,6 +814,11 @@ class DaemonServiceClient extends $grpc.Client {
'/pasteferry.v1.DaemonService/SubmitText',
($0.SubmitTextRequest value) => value.writeToBuffer(),
$0.ClipRecord.fromBuffer);
+ static final _$submitFiles =
+ $grpc.ClientMethod<$0.SubmitFilesRequest, $0.ClipRecord>(
+ '/pasteferry.v1.DaemonService/SubmitFiles',
+ ($0.SubmitFilesRequest value) => value.writeToBuffer(),
+ $0.ClipRecord.fromBuffer);
static final _$getWebShare = $grpc.ClientMethod<$0.Empty, $0.WebShareStatus>(
'/pasteferry.v1.DaemonService/GetWebShare',
($0.Empty value) => value.writeToBuffer(),
@@ -1269,6 +1282,14 @@ abstract class DaemonServiceBase extends $grpc.Service {
false,
($core.List<$core.int> value) => $0.SubmitTextRequest.fromBuffer(value),
($0.ClipRecord value) => value.writeToBuffer()));
+ $addMethod($grpc.ServiceMethod<$0.SubmitFilesRequest, $0.ClipRecord>(
+ 'SubmitFiles',
+ submitFiles_Pre,
+ false,
+ false,
+ ($core.List<$core.int> value) =>
+ $0.SubmitFilesRequest.fromBuffer(value),
+ ($0.ClipRecord value) => value.writeToBuffer()));
$addMethod($grpc.ServiceMethod<$0.Empty, $0.WebShareStatus>(
'GetWebShare',
getWebShare_Pre,
@@ -1769,6 +1790,14 @@ abstract class DaemonServiceBase extends $grpc.Service {
$async.Future<$0.ClipRecord> submitText(
$grpc.ServiceCall call, $0.SubmitTextRequest request);
+ $async.Future<$0.ClipRecord> submitFiles_Pre($grpc.ServiceCall $call,
+ $async.Future<$0.SubmitFilesRequest> $request) async {
+ return submitFiles($call, await $request);
+ }
+
+ $async.Future<$0.ClipRecord> submitFiles(
+ $grpc.ServiceCall call, $0.SubmitFilesRequest request);
+
$async.Future<$0.WebShareStatus> getWebShare_Pre(
$grpc.ServiceCall $call, $async.Future<$0.Empty> $request) async {
return getWebShare($call, await $request);
diff --git a/ui/lib/gen/pasteferry/v1/daemon.pbjson.dart b/ui/lib/gen/pasteferry/v1/daemon.pbjson.dart
index 7f171f7..1d3d683 100644
--- a/ui/lib/gen/pasteferry/v1/daemon.pbjson.dart
+++ b/ui/lib/gen/pasteferry/v1/daemon.pbjson.dart
@@ -1979,6 +1979,18 @@ const SubmitTextRequest$json = {
final $typed_data.Uint8List submitTextRequestDescriptor = $convert
.base64Decode('ChFTdWJtaXRUZXh0UmVxdWVzdBISCgR0ZXh0GAEgASgJUgR0ZXh0');
+@$core.Deprecated('Use submitFilesRequestDescriptor instead')
+const SubmitFilesRequest$json = {
+ '1': 'SubmitFilesRequest',
+ '2': [
+ {'1': 'paths', '3': 1, '4': 3, '5': 9, '10': 'paths'},
+ ],
+};
+
+/// Descriptor for `SubmitFilesRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List submitFilesRequestDescriptor = $convert
+ .base64Decode('ChJTdWJtaXRGaWxlc1JlcXVlc3QSFAoFcGF0aHMYASADKAlSBXBhdGhz');
+
@$core.Deprecated('Use webShareStatusDescriptor instead')
const WebShareStatus$json = {
'1': 'WebShareStatus',
diff --git a/ui/lib/l10n/app_en.arb b/ui/lib/l10n/app_en.arb
index 5042962..c21fb5a 100644
--- a/ui/lib/l10n/app_en.arb
+++ b/ui/lib/l10n/app_en.arb
@@ -1658,6 +1658,8 @@
"mSendTitle": "Send to your computer",
"mSendHint": "Type or paste text",
"mPaste": "Paste",
+ "mPhotosFiles": "Photos or files",
+ "mFilesSent": "{n, plural, =1{1 file sent to your computer} other{{n} files sent to your computer}}",
"mClipboardNoText": "The clipboard has no text",
"mSendAction": "Send",
"mSendTo": "Goes to {names}",
diff --git a/ui/lib/l10n/app_ja.arb b/ui/lib/l10n/app_ja.arb
index ba8e2a4..70ba161 100644
--- a/ui/lib/l10n/app_ja.arb
+++ b/ui/lib/l10n/app_ja.arb
@@ -646,6 +646,8 @@
"mSendTitle": "パソコンへ送る",
"mSendHint": "テキストを入力または貼り付け",
"mPaste": "貼り付け",
+ "mPhotosFiles": "写真またはファイル",
+ "mFilesSent": "{n} 件のファイルをコンピュータに送りました",
"mClipboardNoText": "クリップボードにテキストがありません",
"mSendAction": "送信",
"mSendTo": "{names} に送信します",
diff --git a/ui/lib/l10n/app_localizations.dart b/ui/lib/l10n/app_localizations.dart
index e952b2d..dd38723 100644
--- a/ui/lib/l10n/app_localizations.dart
+++ b/ui/lib/l10n/app_localizations.dart
@@ -3986,6 +3986,18 @@ abstract class AppLocalizations {
/// **'Paste'**
String get mPaste;
+ /// No description provided for @mPhotosFiles.
+ ///
+ /// In en, this message translates to:
+ /// **'Photos or files'**
+ String get mPhotosFiles;
+
+ /// No description provided for @mFilesSent.
+ ///
+ /// In en, this message translates to:
+ /// **'{n, plural, =1{1 file sent to your computer} other{{n} files sent to your computer}}'**
+ String mFilesSent(num n);
+
/// No description provided for @mClipboardNoText.
///
/// In en, this message translates to:
diff --git a/ui/lib/l10n/app_localizations_en.dart b/ui/lib/l10n/app_localizations_en.dart
index 15961ed..6c5cbde 100644
--- a/ui/lib/l10n/app_localizations_en.dart
+++ b/ui/lib/l10n/app_localizations_en.dart
@@ -2435,6 +2435,20 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get mPaste => 'Paste';
+ @override
+ String get mPhotosFiles => 'Photos or files';
+
+ @override
+ String mFilesSent(num n) {
+ String _temp0 = intl.Intl.pluralLogic(
+ n,
+ locale: localeName,
+ other: '$n files sent to your computer',
+ one: '1 file sent to your computer',
+ );
+ return '$_temp0';
+ }
+
@override
String get mClipboardNoText => 'The clipboard has no text';
diff --git a/ui/lib/l10n/app_localizations_ja.dart b/ui/lib/l10n/app_localizations_ja.dart
index b2a7fc6..212405a 100644
--- a/ui/lib/l10n/app_localizations_ja.dart
+++ b/ui/lib/l10n/app_localizations_ja.dart
@@ -2262,6 +2262,14 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get mPaste => '貼り付け';
+ @override
+ String get mPhotosFiles => '写真またはファイル';
+
+ @override
+ String mFilesSent(num n) {
+ return '$n 件のファイルをコンピュータに送りました';
+ }
+
@override
String get mClipboardNoText => 'クリップボードにテキストがありません';
diff --git a/ui/lib/l10n/app_localizations_zh.dart b/ui/lib/l10n/app_localizations_zh.dart
index 2208e7d..5fecea5 100644
--- a/ui/lib/l10n/app_localizations_zh.dart
+++ b/ui/lib/l10n/app_localizations_zh.dart
@@ -2236,6 +2236,14 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get mPaste => '粘贴';
+ @override
+ String get mPhotosFiles => '照片或文件';
+
+ @override
+ String mFilesSent(num n) {
+ return '$n 个文件已发到电脑';
+ }
+
@override
String get mClipboardNoText => '剪贴板里没有文字';
@@ -4592,6 +4600,14 @@ class AppLocalizationsZhHantHk extends AppLocalizationsZh {
@override
String get mPaste => '貼上';
+ @override
+ String get mPhotosFiles => '照片或檔案';
+
+ @override
+ String mFilesSent(num n) {
+ return '$n 個檔案已傳到電腦';
+ }
+
@override
String get mClipboardNoText => '剪貼簿裡沒有文字';
@@ -6948,6 +6964,14 @@ class AppLocalizationsZhHantTw extends AppLocalizationsZh {
@override
String get mPaste => '貼上';
+ @override
+ String get mPhotosFiles => '照片或檔案';
+
+ @override
+ String mFilesSent(num n) {
+ return '$n 個檔案已傳到電腦';
+ }
+
@override
String get mClipboardNoText => '剪貼簿裡沒有文字';
diff --git a/ui/lib/l10n/app_zh.arb b/ui/lib/l10n/app_zh.arb
index 2b6a42e..343fa7d 100644
--- a/ui/lib/l10n/app_zh.arb
+++ b/ui/lib/l10n/app_zh.arb
@@ -646,6 +646,8 @@
"mSendTitle": "发给电脑",
"mSendHint": "输入或粘贴文字",
"mPaste": "粘贴",
+ "mPhotosFiles": "照片或文件",
+ "mFilesSent": "{n} 个文件已发到电脑",
"mClipboardNoText": "剪贴板里没有文字",
"mSendAction": "发送",
"mSendTo": "将发给 {names}",
diff --git a/ui/lib/l10n/app_zh_Hant_HK.arb b/ui/lib/l10n/app_zh_Hant_HK.arb
index 487bf53..e7af0eb 100644
--- a/ui/lib/l10n/app_zh_Hant_HK.arb
+++ b/ui/lib/l10n/app_zh_Hant_HK.arb
@@ -646,6 +646,8 @@
"mSendTitle": "傳給電腦",
"mSendHint": "輸入或貼上文字",
"mPaste": "貼上",
+ "mPhotosFiles": "照片或檔案",
+ "mFilesSent": "{n} 個檔案已傳到電腦",
"mClipboardNoText": "剪貼簿裡沒有文字",
"mSendAction": "傳送",
"mSendTo": "將傳給 {names}",
diff --git a/ui/lib/l10n/app_zh_Hant_TW.arb b/ui/lib/l10n/app_zh_Hant_TW.arb
index f5233f5..fe41a8d 100644
--- a/ui/lib/l10n/app_zh_Hant_TW.arb
+++ b/ui/lib/l10n/app_zh_Hant_TW.arb
@@ -646,6 +646,8 @@
"mSendTitle": "傳給電腦",
"mSendHint": "輸入或貼上文字",
"mPaste": "貼上",
+ "mPhotosFiles": "照片或檔案",
+ "mFilesSent": "{n} 個檔案已傳到電腦",
"mClipboardNoText": "剪貼簿裡沒有文字",
"mSendAction": "傳送",
"mSendTo": "將傳給 {names}",
diff --git a/ui/lib/mobile/send_tab.dart b/ui/lib/mobile/send_tab.dart
index d5acde7..dfce8a3 100644
--- a/ui/lib/mobile/send_tab.dart
+++ b/ui/lib/mobile/send_tab.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:file_selector/file_selector.dart';
import 'package:flutter/services.dart';
import '../app_state.dart';
@@ -28,6 +29,7 @@ class _SendTabState extends State<SendTab> with WidgetsBindingObserver {
final _text = TextEditingController();
bool _clipboardHasText = false;
bool _sending = false;
+ bool _picking = false;
@override
void initState() {
@@ -72,6 +74,25 @@ class _SendTabState extends State<SendTab> with WidgetsBindingObserver {
);
}
+ /// 选照片或文件发到电脑。file_selector 在 Android 上会把选中的内容拷到应用缓存,
+ /// 后台服务和 App 在同一个进程里,直接读得到这些路径。
+ Future<void> _pickFiles() async {
+ final l = context.l10n;
+ if (_picking) return;
+ setState(() => _picking = true);
+ try {
+ final files = await openFiles();
+ if (files.isEmpty || !mounted) return;
+ final paths = [for (final f in files) f.path];
+ await AppScope.read(context).submitFiles(paths);
+ if (mounted) showToast(context, l.mFilesSent(paths.length));
+ } catch (e) {
+ if (mounted) showToast(context, l.mSendFailed(AppState.describeError(e)), error: true);
+ } finally {
+ if (mounted) setState(() => _picking = false);
+ }
+ }
+
Future<void> _send() async {
final text = _text.text;
if (text.trim().isEmpty || _sending) return;
@@ -138,16 +159,26 @@ class _SendTabState extends State<SendTab> with WidgetsBindingObserver {
contentPadding: const EdgeInsets.symmetric(horizontal: Insets.lg, vertical: Insets.md),
),
),
+ if (_clipboardHasText)
+ Align(
+ alignment: Alignment.centerRight,
+ child: TextButton.icon(
+ style: TextButton.styleFrom(padding: const EdgeInsets.symmetric(horizontal: Insets.xs)),
+ onPressed: _paste,
+ icon: Icon(AppIcons.docOnClipboard, size: 18),
+ label: Text(l.mPaste),
+ ),
+ ),
const SizedBox(height: Insets.md),
Row(
children: [
- // 网页这里是「选择文件」;App 一期只发文字,换成「粘贴」:剪贴板里有文字时才能点
+ // 和网页一样:左边选照片或文件,右边发文字
Expanded(
child: FilledButton.icon(
style: secondaryButtonStyle(context),
- onPressed: _clipboardHasText ? _paste : null,
- icon: Icon(AppIcons.docOnClipboard, size: 20),
- label: Text(l.mPaste),
+ onPressed: _picking ? null : _pickFiles,
+ icon: Icon(AppIcons.folder, size: 20),
+ label: Text(l.mPhotosFiles),
),
),
const SizedBox(width: Insets.md),