aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-09-30 15:38:49 +0000
committerMario <mario@mariovavti.com>2021-09-30 15:38:49 +0000
commite48ed9d06d448e50b26ba4ef08accecf4965f769 (patch)
treedaf6f2081764b44b9240869a7bd915e756efc0bb
parent2c7c9ae2d7f3549a5ec9f7f00373fe5572c2c25d (diff)
parent6236869ebed317aa06078f606156edcec9f9b55b (diff)
downloadvolse-hubzilla-e48ed9d06d448e50b26ba4ef08accecf4965f769.tar.gz
volse-hubzilla-e48ed9d06d448e50b26ba4ef08accecf4965f769.tar.bz2
volse-hubzilla-e48ed9d06d448e50b26ba4ef08accecf4965f769.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--Zotlabs/Daemon/File_importer.php12
-rw-r--r--Zotlabs/Module/Import_progress.php66
2 files changed, 75 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/File_importer.php b/Zotlabs/Daemon/File_importer.php
index bb12cdf70..28fb172a7 100644
--- a/Zotlabs/Daemon/File_importer.php
+++ b/Zotlabs/Daemon/File_importer.php
@@ -48,12 +48,18 @@ class File_importer {
$j = json_decode($x['body'],true);
- if(! is_array($j[0]['attach']) || ! count($j[0]['attach'])) {
- PConfig::Set($channel['channel_id'], 'import', 'files', 1);
+ if(! is_array($j['results'][0]['attach']) || ! count($j['results'][0]['attach'])) {
return;
}
- $r = sync_files($channel,$j);
+ $r = sync_files($channel, $j['results']);
+
+ PConfig::Set($channel['channel_id'], 'import', 'files_progress', [
+ 'files_total' => $j['total'],
+ 'files_page' => 1, // export page atm returns just one file
+ 'last_page' => $page,
+ 'next_cmd' => ['File_importer',sprintf('%d',$page + 1), $channel['channel_address'], urlencode($hz_server)]
+ ]);
$page++;
diff --git a/Zotlabs/Module/Import_progress.php b/Zotlabs/Module/Import_progress.php
new file mode 100644
index 000000000..3bae94bbb
--- /dev/null
+++ b/Zotlabs/Module/Import_progress.php
@@ -0,0 +1,66 @@
+<?php
+namespace Zotlabs\Module;
+
+use Zotlabs\Lib\PConfig;
+
+class Import_progress extends \Zotlabs\Web\Controller {
+
+ function post() {
+
+ if(! local_channel())
+ return;
+
+ }
+
+ function get() {
+
+ if(! local_channel()) {
+ return;
+ }
+
+ // items
+ $c = PConfig::Get(local_channel(), 'import', 'content_progress');
+
+ if (!$c) {
+ $co = 'Status items: waiting to start...';
+ }
+ else {
+ $total_cpages = floor(intval($c['items_total']) / intval($c['items_page']));
+ if(!$total_cpages)
+ $total_cpages = 1; // because of floor
+
+ $cpage = $c['last_page'] + 1; // because page count start at 0
+
+ $co = 'Status items: ' . floor((intval($cpage) * 100) / $total_cpages) . '%';
+ }
+
+ // files
+ $f = PConfig::Get(local_channel(), 'import', 'files_progress');
+
+ if (!$f) {
+ $fo = 'Status files: waiting to start...';
+ }
+ else {
+ $total_fpages = floor(intval($f['files_total']) / intval($f['files_page']));
+ if(!$total_fpages)
+ $total_fpages = 1;
+
+ $fpage = $f['last_page'] + 1;
+
+ $fo = 'Status files: ' . floor((intval($fpage) * 100) / $total_fpages) . '%';
+ }
+
+ $o .= '<h3>' . $co . '</h3>';
+ if (is_array($c))
+ $o .= '<pre>' . htmlspecialchars(print_array($c)) . '</pre>';
+
+ $o .= '<h3>' . $fo . '</h3>';
+ if (is_array($f))
+ $o .= '<pre>' . htmlspecialchars(print_array($f)) . '</pre>';
+
+ $o .= '<h3> Refresh page for updates!</h3>';
+
+ return $o;
+ }
+
+}