feat: add proton drive upload support

.gitignore

@@ -24,3 +24,5 @@ go.work.sum
 
 # env file
 .env
+
+.tmpbin/

cmd/constants.go

@@ -4,7 +4,7 @@ package cli
 const (
 	cacheFileName  = "protondrive/cache.yaml"
 	configFileName = "protondrive/config.yaml"
-	Version        = "0.0.1"
-	AppVersion     = "Other"
+	Version        = "0.1.0"
+	AppVersion     = "macos-drive@1.0.0-alpha.1+rclone"
 	UserAgent      = "proton-cli" + "/" + Version + " (Proton CLI v" + Version + ")"
 )

cmd/drive/upload.go

@@ -0,0 +1,67 @@
+package driveCmd
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	cli "github.com/major0/proton-cli/cmd"
+	proton "github.com/major0/proton-cli/proton"
+	"github.com/spf13/cobra"
+)
+
+var driveUploadParams = struct {
+	filePath   string
+	remoteName string
+	shareID    string
+}{
+	shareID: "primary",
+}
+
+var driveUploadCmd = &cobra.Command{
+	Use:   "upload [options]",
+	Short: "Upload a file to Proton Drive",
+	Long:  "Upload a file to Proton Drive (currently to the root of the selected share)",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if driveUploadParams.filePath == "" {
+			return fmt.Errorf("--file is required")
+		}
+
+		session, err := cli.SessionRestore()
+		if err != nil {
+			return err
+		}
+
+		ctx, cancel := context.WithTimeout(context.Background(), cli.Timeout)
+		defer cancel()
+
+		remoteName := driveUploadParams.remoteName
+		if remoteName == "" {
+			remoteName = filepath.Base(driveUploadParams.filePath)
+		}
+
+		var upload *proton.UploadResult
+		if driveUploadParams.shareID == "" || driveUploadParams.shareID == "primary" {
+			upload, err = session.UploadFileToPrimaryShareRoot(ctx, driveUploadParams.filePath, remoteName)
+		} else {
+			upload, err = session.UploadFileToShareRoot(ctx, driveUploadParams.shareID, driveUploadParams.filePath, remoteName)
+		}
+		if err != nil {
+			return err
+		}
+
+		fmt.Printf("uploaded: %s\n", upload.FileName)
+		fmt.Printf("size: %d bytes\n", upload.Size)
+		fmt.Printf("share_id: %s\n", upload.ShareID)
+		fmt.Printf("link_id: %s\n", upload.LinkID)
+		fmt.Printf("revision_id: %s\n", upload.RevisionID)
+		return nil
+	},
+}
+
+func init() {
+	driveCmd.AddCommand(driveUploadCmd)
+	driveUploadCmd.Flags().StringVarP(&driveUploadParams.filePath, "file", "f", "", "Local file path to upload")
+	driveUploadCmd.Flags().StringVarP(&driveUploadParams.remoteName, "name", "n", "", "Remote file name (defaults to basename of --file)")
+	driveUploadCmd.Flags().StringVar(&driveUploadParams.shareID, "share-id", "primary", "Share ID to upload into, or 'primary'")
+}

go.mod

@@ -47,7 +47,7 @@ require (
 
 replace (
 	github.com/ProtonMail/go-crypto => github.com/ProtonMail/go-crypto v1.1.5-proton
-	github.com/ProtonMail/go-proton-api => github.com/major0/go-proton-api v0.0.4-proton-cleanup
+	github.com/ProtonMail/go-proton-api => ./third_party/go-proton-api
 	github.com/ProtonMail/gopenpgp/v2 => github.com/ProtonMail/gopenpgp/v2 v2.8.2-proton
 	github.com/miteshbsjat/textfilekv => github.com/major0/textfilekv v1.1.1-list-keys
 )

go.sum

@@ -69,8 +69,6 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/major0/go-proton-api v0.0.4-proton-cleanup h1:Ar0pePIyKmnWmsNHIpky5VtGQAqqsfd26wWzJG3bSY4=
-github.com/major0/go-proton-api v0.0.4-proton-cleanup/go.mod h1:oy8mLH7OSa/wgHMDkMJECBntanLxhuLHp2kYSde1cCk=
 github.com/major0/textfilekv v1.1.1-list-keys h1:0mmMGN2YoiQXNpy5sQCUvah8b6nMvDn+6rEOVHYkDvs=
 github.com/major0/textfilekv v1.1.1-list-keys/go.mod h1:1UnyP8127ohnKlvpKawjMx/vECvSHtCz8MQVttbtv0k=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=

proton/links.go

@@ -131,7 +131,7 @@ func (l *Link) getKeyRing(address string) (*crypto.KeyRing, error) {
 
 func (l *Link) getAddrKeyRing(address string) (*crypto.KeyRing, error) {
 	slog.Debug("link.getAddrKeyRing", "address", address)
-	if addr, ok := l.session.addresses[l.protonLink.NameSignatureEmail]; ok {
+	if addr, ok := l.session.addresses[address]; ok {
 		if addrKR, ok := l.session.AddressKeyRing[addr.ID]; ok {
 			return addrKR, nil
 		}

proton/session.go

@@ -22,6 +22,7 @@ type Session struct {
 	MaxWorkers int
 
 	addresses      map[string]proton.Address
+	addressesByID  map[string]proton.Address
 	AddressKeyRing map[string]*crypto.KeyRing
 
 	user        proton.User
@@ -71,8 +72,10 @@ func SessionFromCredentials(ctx context.Context, options []proton.Option, creds
 	}
 
 	session.addresses = make(map[string]proton.Address)
+	session.addressesByID = make(map[string]proton.Address)
 	for _, addr := range addrs {
 		session.addresses[addr.Email] = addr
+		session.addressesByID[addr.ID] = addr
 	}
 
 	return &session, nil