Skip to content

Commit c875559

Browse files
committed
refactor: dont wrap rclone command for shared_with_me
1 parent c65638a commit c875559

5 files changed

Lines changed: 18 additions & 29 deletions

File tree

.goreleaser.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ nfpms:
7171
dst: /usr/lib/systemd/user/adfinis-rclone-mgr@.service
7272
- src: ./assets/rclone@.service
7373
dst: /usr/lib/systemd/user/rclone@.service
74-
- src: ./assets/adfinis-rclone-wrapper.sh
75-
dst: /usr/bin/adfinis-rclone-wrapper.sh
7674
- src: ./assets/google_drive_opener.py
7775
dst: /usr/share/nautilus-python/extensions/google_drive_opener.py
7876
- src: ./assets/adfinis-rclone-mgr.desktop
@@ -99,7 +97,6 @@ nfpms:
9997
- xclip
10098
- zenity
10199

102-
103100
aurs:
104101
- name: "adfinis-rclone-mgr-bin"
105102
homepage: "https://github.com/adfinis/adfinis-rclone-mgr/"
@@ -118,8 +115,6 @@ aurs:
118115
# systemd
119116
install -Dm644 "./assets/adfinis-rclone-mgr@.service" "${pkgdir}/usr/lib/systemd/user/adfinis-rclone-mgr@.service"
120117
install -Dm644 "./assets/rclone@.service" "${pkgdir}/usr/lib/systemd/user/rclone@.service"
121-
# scripts
122-
install -Dm644 "./assets/adfinis-rclone-wrapper.sh" "${pkgdir}/usr/bin/adfinis-rclone-wrapper.sh"
123118
# nautilus extension
124119
install -Dm644 "./assets/google_drive_opener.py" "${pkgdir}/usr/share/nautilus-python/extensions/google_drive_opener.py"
125120
# desktop integration

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ This repository provides a streamlined way to mount Google Drive using Rclone, t
4949
```bash
5050
sudo cp assets/rclone@.service /usr/lib/systemd/user/
5151
sudo cp assets/adfinis-rclone-mgr@.service /usr/lib/systemd/user/
52-
sudo cp assets/adfinis-rclone-wrapper.sh /usr/bin/
5352
sudo cp assets/google_drive_opener.py /usr/share/nautilus-python/extensions/
5453
sudo cp assets/adfinis-rclone-mgr.desktop /usr/share/applications/
5554
sudo cp assets/adfinis-rclone-mgr.png /usr/share/icons/hicolor/512x512/apps/

assets/adfinis-rclone-wrapper.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

assets/rclone@.service

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ AssertPathIsDirectory="%h/google/%I"
88

99
[Service]
1010
Type=notify
11-
ExecStart=/usr/bin/adfinis-rclone-wrapper.sh %I
11+
ExecStart=/usr/bin/rclone mount \
12+
--cache-dir "%h/.cache/google/%I" \
13+
--vfs-cache-mode writes \
14+
--vfs-cache-max-size 10G \
15+
"%I:" "%h/google/%I"
1216
ExecStop=/bin/fusermount -u "%h/google/%I"
1317

1418
[Install]

rclone.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func handleRcloneConfig(ctx context.Context, drives []models.Drive, clientID, cl
2525
driveName := sanitizeDriveName(drive.Name)
2626
if drive.Enabled {
2727
var configMap rc.Params
28-
// special case for personal drive
29-
if drive.ID == "my_drive" || drive.ID == "shared_with_me" {
28+
switch drive.ID {
29+
case "my_drive":
3030
configMap = rc.Params{
3131
"type": "drive",
3232
"root_folder_id": "",
@@ -35,7 +35,17 @@ func handleRcloneConfig(ctx context.Context, drives []models.Drive, clientID, cl
3535
"client_secret": clientSecret,
3636
"token": token,
3737
}
38-
} else {
38+
case "shared_with_me":
39+
configMap = rc.Params{
40+
"type": "drive",
41+
"root_folder_id": "",
42+
"scope": "drive",
43+
"client_id": clientID,
44+
"client_secret": clientSecret,
45+
"token": token,
46+
"shared_with_me": true,
47+
}
48+
default:
3949
// shared drive
4050
configMap = rc.Params{
4151
"type": "drive",

0 commit comments

Comments
 (0)