techbloc/carichello
1
0
Fork 0
Code Issues 2 Pull requests Releases Activity Actions

correzioni e reformat

Browse source
This commit is contained in:
boyska 2024-11-17 00:12:38 +01:00
parent 3aaa0d9236
commit 1ef38b59e4
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
carichello.py
View file

@ -123,7 +123,7 @@ class ArkiwiBackend(RcloneBackend):
self.prefix: bytes = prefix.strip("/").encode("utf8")
def ftp_path(self, path: bytes) -> bytes:
return b"ftp://upload.arkiwi.org/%s/" % (destination_path.strip(b"/"),))
return b"ftp://upload.arkiwi.org/%s/" % (path.strip(b"/"),)
def actual_path(self, path: bytes) -> bytes:
return self.prefix + b"/" + path.lstrip(b"/")
@ -137,7 +137,7 @@ class ArkiwiBackend(RcloneBackend):
)
return f"https://www.arkiwi.org/path64/{path}/redirect"
#2024-11-05: cambio da rclone a curl per girare intorno ai bug di webdav. Poi bisogna togliere l'intero metodo, così torniamo a quello di RcloneBackend
# 2024-11-05: cambio da rclone a curl per girare intorno ai bug di webdav. Poi bisogna togliere l'intero metodo, così torniamo a quello di RcloneBackend
def exists(self, destination_path: bytes):
cmd = ["curl", "--netrc", "--head", "--silent", self.ftp_path(destination_path)]
try:
@ -155,7 +155,13 @@ class ArkiwiBackend(RcloneBackend):
"""
# 2024-11-05: siccome webdav è rotto e invece FTP funziona, sostituisco la copia webdav (rclone) con una fatta con curl
# super().copy(filename, self.actual_path(destination_path))
cmd = ["curl", "--netrc", "--upload-file", str(filename), self.ftp_path(destination_path)]
cmd = [
"curl",
"--netrc",
"--upload-file",
str(filename),
self.ftp_path(destination_path),
]
subprocess.run(cmd, check=True)
url = self.path_to_url(destination_path)
@ -189,7 +195,7 @@ class Carichello:
type=Path,
default=Path("~/.config/carichello/config.json").expanduser(),
)
p.add_argument("file", type=Path, nargs='?')
p.add_argument("file", type=Path, nargs="?")
return p
def error(self) -> int:
@ -234,9 +240,9 @@ class Carichello:
return 1
self.args.file = Path(output)
if not self.args.file.exists():
subprocess.run([
"zenity", "--error", "--text=Il file selezionato non esiste"
])
subprocess.run(
["zenity", "--error", "--text=Il file selezionato non esiste"]
)
return 1
now = datetime.datetime.now()
dest_directory = f"/{now.year}/{now.month}"