Skip to content

Added url file upload for new API #1534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gluafamichl merged 1 commit into from
Sep 1, 2025
Merged

Added url file upload for new API #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/inc/apiv2/model/files.routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,12 @@ protected function createObject(array $data): int {
/* Since we are renaming the file _before_ import the name is temporary changed */
$dummyPost["imfile"] = [$data[File::FILENAME]];
break;
case "url":
$dummyPost["url"] = $data["sourceData"];
break;
default:
// TODO: Choice validation are model based checks
throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import");
throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import, url");
}

/* TODO: Hackish view to revert back to required (hardcoded) view */
Expand All @@ -144,7 +147,7 @@ protected function createObject(array $data): int {
}
catch (Exception $e) {
/* In case of errors, ensure old state is restored */
if (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])) {
if ($doRenameImport) {
rename(
$this->getImportPath() . $data[File::FILENAME],
$this->getImportPath() . $data["sourceData"]
Expand Down
6 changes: 4 additions & 2 deletions src/inc/utils/FileUtils.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,11 @@ public static function add($source, $file, $post, $view) {
break;
case "url":
// from url
$realname = str_replace(" ", "_", htmlentities(basename($post["url"]), ENT_QUOTES, "UTF-8"));
$realname = (isset($post["filename"])) ? $post["filename"] :
str_replace(" ", "_", htmlentities(basename($post["url"]), ENT_QUOTES, "UTF-8"));

if (strlen($realname) == 0) {
throw new HttpError("Empty URL provided!");
throw new HttpError("Empty URL/name provided!");
}
else if ($realname[0] == '.') {
$realname[0] = "_";
Expand Down