Skip to content

Improve iterators #516

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
come-nc merged 17 commits into from
Feb 10, 2025
Merged

Improve iterators #516

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c6f71fd
Add Content-Type response header for JSON responses
Altahrim Nov 9, 2023
2e4d4dd
Improve iterators
Altahrim Nov 9, 2023
044b838
fix: Fix recursive iterating over files, avoid useless recursion in d…
come-nc Feb 4, 2025
b2372ea
fix: Use the new Generator in more places and avoid yielding root folder
come-nc Feb 4, 2025
5abf17d
fix: Remove now unused class and generate index.php and phar
come-nc Feb 4, 2025
f869f06
fix: Fix namespaces and typo in variable names
come-nc Feb 4, 2025
35330fb
chore: Update updater.phar
come-nc Feb 4, 2025
5b27f07
fix: Only recurse on directories
come-nc Feb 4, 2025
c504bf5
chore: make index.php updater.phar
come-nc Feb 4, 2025
a81b79a
chore: composer install
come-nc Feb 4, 2025
6b83daf
chore: make index.php updater.phar
come-nc Feb 4, 2025
9f0a0b7
fix: Fix application directory listing
come-nc Feb 4, 2025
e23bd54
chore: master is now 32
come-nc Feb 4, 2025
dd5f445
fix: Replace baseDir property by cleaner nextcloudDir
come-nc Feb 6, 2025
f37bf93
fix: Improve variable names
come-nc Feb 6, 2025
1d90049
fix: Store first level children in an array to avoid problems
come-nc Feb 6, 2025
0c05ada
chore: make updater.phar index.php
come-nc Feb 6, 2025
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
Next Next commit
Add Content-Type response header for JSON responses 
Initial work in #90

Signed-off-by: Benjamin Gaussorgues <[email protected]>
  • Loading branch information
@Altahrim @come-nc
Altahrim authored and come-nc committed Feb 4, 2025
commit c6f71fdc2458cc07fad93c6898471e1230af5aa4
4 changes: 4 additions & 0 deletions index.web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public function isAuthenticated(): bool {
if (isset($_POST['step'])) {
// mark step as failed
http_response_code(500);
header('Content-Type: application/json');
echo(json_encode(['proceed' => false, 'response' => $e->getMessage()]));
die();
}
Expand Down Expand Up @@ -140,6 +141,7 @@ public function isAuthenticated(): bool {
break;
}
$updater->endStep($step);
header('Content-Type: application/json');
echo(json_encode(['proceed' => true]));
} catch (UpdateException $e) {
$data = $e->getData();
Expand All @@ -155,6 +157,7 @@ public function isAuthenticated(): bool {
$updater->rollbackChanges($step);
}
http_response_code(500);
header('Content-Type: application/json');
echo(json_encode(['proceed' => false, 'response' => $data]));
} catch (\Exception $e) {
$message = $e->getMessage();
Expand All @@ -170,6 +173,7 @@ public function isAuthenticated(): bool {
$updater->rollbackChanges($step);
}
http_response_code(500);
header('Content-Type: application/json');
echo(json_encode(['proceed' => false, 'response' => $message]));
}

Expand Down