Using an app password is recommended for security
+OneDrive requires OAuth authentication. You'll need to:
+For shared or business drives
+Google Drive requires OAuth authentication. You'll need to:
+Using an app password is recommended for security
+OneDrive requires OAuth authentication. You'll need to:
+For shared or business drives
+Google Drive requires OAuth authentication. You'll need to:
+Location to move files after successful transfer
Optional: Additional rclone flags for fine-tuning the transfer.
diff --git a/internal/db/db.go b/internal/db/db.go index c02adb9..1779f94 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -66,6 +66,11 @@ type TransferConfig struct { SourceDomain string `form:"source_domain"` // FTP source fields SourcePassiveMode bool `gorm:"default:true" form:"source_passive_mode"` + // OneDrive and Google Drive source fields + SourceClientID string `form:"source_client_id"` + SourceClientSecret string `form:"source_client_secret" gorm:"-"` // Not stored in DB, only used for form + SourceDriveID string `form:"source_drive_id"` // For OneDrive + SourceTeamDrive string `form:"source_team_drive"` // For Google Drive // General fields FilePattern string `gorm:"default:'*'" form:"file_pattern"` OutputPattern string `form:"output_pattern"` // Pattern for output filenames with date variables @@ -87,6 +92,11 @@ type TransferConfig struct { DestDomain string `form:"dest_domain"` // FTP destination fields DestPassiveMode bool `gorm:"default:true" form:"dest_passive_mode"` + // OneDrive and Google Drive destination fields + DestClientID string `form:"dest_client_id"` + DestClientSecret string `form:"dest_client_secret" gorm:"-"` // Not stored in DB, only used for form + DestDriveID string `form:"dest_drive_id"` // For OneDrive + DestTeamDrive string `form:"dest_team_drive"` // For Google Drive // General fields ArchivePath string `form:"archive_path"` ArchiveEnabled bool `gorm:"default:false" form:"archive_enabled"` @@ -426,6 +436,73 @@ func (db *DB) GenerateRcloneConfig(config *TransferConfig) error { args = append(args, "passive", "true") } + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create source config: %v\nOutput: %s", err, output) + } + case "webdav": + args := []string{ + "config", "create", sourceName, "webdav", + "url", config.SourceHost, + "user", config.SourceUser, + "pass", config.SourcePassword, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create source config: %v\nOutput: %s", err, output) + } + case "nextcloud": + args := []string{ + "config", "create", sourceName, "webdav", + "url", config.SourceHost, + "user", config.SourceUser, + "pass", config.SourcePassword, + "vendor", "nextcloud", + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create source config: %v\nOutput: %s", err, output) + } + case "onedrive": + args := []string{ + "config", "create", sourceName, "onedrive", + "client_id", config.SourceClientID, + "client_secret", config.SourceClientSecret, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + if config.SourceDriveID != "" { + args = append(args, "drive_id", config.SourceDriveID) + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create source config: %v\nOutput: %s", err, output) + } + case "google_drive": + args := []string{ + "config", "create", sourceName, "drive", + "client_id", config.SourceClientID, + "client_secret", config.SourceClientSecret, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + if config.SourceTeamDrive != "" { + args = append(args, "team_drive", config.SourceTeamDrive) + } + cmd := exec.Command(rclonePath, args...) if output, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("failed to create source config: %v\nOutput: %s", err, output) @@ -547,6 +624,73 @@ func (db *DB) GenerateRcloneConfig(config *TransferConfig) error { args = append(args, "passive", "true") } + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create destination config: %v\nOutput: %s", err, output) + } + case "webdav": + args := []string{ + "config", "create", destName, "webdav", + "url", config.DestHost, + "user", config.DestUser, + "pass", config.DestPassword, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create destination config: %v\nOutput: %s", err, output) + } + case "nextcloud": + args := []string{ + "config", "create", destName, "webdav", + "url", config.DestHost, + "user", config.DestUser, + "pass", config.DestPassword, + "vendor", "nextcloud", + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create destination config: %v\nOutput: %s", err, output) + } + case "onedrive": + args := []string{ + "config", "create", destName, "onedrive", + "client_id", config.DestClientID, + "client_secret", config.DestClientSecret, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + if config.DestDriveID != "" { + args = append(args, "drive_id", config.DestDriveID) + } + + cmd := exec.Command(rclonePath, args...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to create destination config: %v\nOutput: %s", err, output) + } + case "google_drive": + args := []string{ + "config", "create", destName, "drive", + "client_id", config.DestClientID, + "client_secret", config.DestClientSecret, + "--non-interactive", + "--config", configPath, + "--log-level", "ERROR", + } + + if config.DestTeamDrive != "" { + args = append(args, "team_drive", config.DestTeamDrive) + } + cmd := exec.Command(rclonePath, args...) if output, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("failed to create destination config: %v\nOutput: %s", err, output) diff --git a/internal/db/migrations/add_cloud_storage_fields.go b/internal/db/migrations/add_cloud_storage_fields.go new file mode 100644 index 0000000..3582df0 --- /dev/null +++ b/internal/db/migrations/add_cloud_storage_fields.go @@ -0,0 +1,63 @@ +package migrations + +import ( + "github.com/go-gormigrate/gormigrate/v2" + "gorm.io/gorm" +) + +// AddCloudStorageFields adds fields for WebDAV, NextCloud, OneDrive, and Google Drive +func AddCloudStorageFields() *gormigrate.Migration { + return &gormigrate.Migration{ + ID: "add_cloud_storage_fields", + Migrate: func(tx *gorm.DB) error { + // Add source fields + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN source_client_id VARCHAR(255)").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN source_drive_id VARCHAR(255)").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN source_team_drive VARCHAR(255)").Error; err != nil { + return err + } + + // Add destination fields + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN dest_client_id VARCHAR(255)").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN dest_drive_id VARCHAR(255)").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs ADD COLUMN dest_team_drive VARCHAR(255)").Error; err != nil { + return err + } + + return nil + }, + Rollback: func(tx *gorm.DB) error { + // Drop source fields + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN source_client_id").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN source_drive_id").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN source_team_drive").Error; err != nil { + return err + } + + // Drop destination fields + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN dest_client_id").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN dest_drive_id").Error; err != nil { + return err + } + if err := tx.Exec("ALTER TABLE transfer_configs DROP COLUMN dest_team_drive").Error; err != nil { + return err + } + + return nil + }, + } +} \ No newline at end of file diff --git a/internal/db/migrations/migrations.go b/internal/db/migrations/migrations.go index 31161b3..c7705a7 100644 --- a/internal/db/migrations/migrations.go +++ b/internal/db/migrations/migrations.go @@ -6,10 +6,11 @@ import ( ) // InitMigrations initializes the migrations -func InitMigrations() *gormigrate.Gormigrate { +func InitMigrations(db *gorm.DB) *gormigrate.Gormigrate { migrations := []*gormigrate.Migration{ // ... existing migrations AddDeleteAfterTransferColumn(), + AddCloudStorageFields(), } return gormigrate.New(db, gormigrate.DefaultOptions, migrations)