From b9b4e71f7d81cca23a08c55fc12db5f62ece2b56 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 30 Sep 2021 12:25:03 +0200
Subject: provide a very simple status page for content import

---
 Zotlabs/Daemon/Content_importer.php | 18 ++++++++++++++----
 Zotlabs/Daemon/File_importer.php    |  8 +++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'Zotlabs/Daemon')

diff --git a/Zotlabs/Daemon/Content_importer.php b/Zotlabs/Daemon/Content_importer.php
index ff6956051..4a07b4cf4 100644
--- a/Zotlabs/Daemon/Content_importer.php
+++ b/Zotlabs/Daemon/Content_importer.php
@@ -3,6 +3,8 @@
 namespace Zotlabs\Daemon;
 
 use Zotlabs\Web\HTTPSig;
+use Zotlabs\Lib\PConfig;
+
 
 require_once('include/cli_startup.php');
 require_once('include/attach.php');
@@ -38,6 +40,8 @@ class Content_importer {
 
 		$x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,false,$redirects,[ 'headers' => $headers ]);
 
+		// logger('item fetch: ' . print_r($x,true));
+
 		if(! $x['success']) {
 			logger('no API response',LOGGER_DEBUG);
 			killme();
@@ -48,11 +52,9 @@ class Content_importer {
 			return;
 		}
 
-		if(! is_array($j['item']) || ! count($j['item']))
+		if(! is_array($j['item']) || ! count($j['item'])) {
 			return;
-
-		//$total_pages = floor(intval($j['items_total']) / intval($j['items_page']));
-		//logger('importing items: ' . floor((intval($page) * 100) / $total_pages) . '%');
+		}
 
 		$saved_notification_flags = notifications_off($channel['channel_id']);
 
@@ -60,6 +62,14 @@ class Content_importer {
 
 		notifications_on($channel['channel_id'], $saved_notification_flags);
 
+		PConfig::Set($channel['channel_id'], 'import', 'content_progress', [
+			'items_total' => $j['items_total'],
+			'items_page' => $j['items_page'],
+			'items_current_page' => count($j['item']),
+			'last_page' => $page,
+			'next_cmd' => ['Content_importer', sprintf('%d',$page + 1), $since, $until, $channel['channel_address'], urlencode($hz_server)]
+		]);
+
 		$page++;
 
 		Master::Summon([ 'Content_importer', sprintf('%d',$page), $since, $until, $channel['channel_address'], urlencode($hz_server) ]);
diff --git a/Zotlabs/Daemon/File_importer.php b/Zotlabs/Daemon/File_importer.php
index 2be946fc3..bb12cdf70 100644
--- a/Zotlabs/Daemon/File_importer.php
+++ b/Zotlabs/Daemon/File_importer.php
@@ -3,6 +3,8 @@
 namespace Zotlabs\Daemon;
 
 use Zotlabs\Web\HTTPSig;
+use Zotlabs\Lib\PConfig;
+
 
 require_once('include/cli_startup.php');
 require_once('include/attach.php');
@@ -35,7 +37,9 @@ class File_importer {
 
 		$headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),true,'sha512');
 
+		// TODO: implement total count
 		$x = z_fetch_url($hz_server . '/api/z/1.0/file/export_page?f=records=1&page=' . $page, false, $redirects, [ 'headers' => $headers ]);
+		// logger('file fetch: ' . print_r($x,true));
 
 		if(! $x['success']) {
 			logger('no API response',LOGGER_DEBUG);
@@ -44,8 +48,10 @@ class File_importer {
 
 		$j = json_decode($x['body'],true);
 
-		if(! is_array($j[0]['attach']) || ! count($j[0]['attach']))
+		if(! is_array($j[0]['attach']) || ! count($j[0]['attach'])) {
+			PConfig::Set($channel['channel_id'], 'import', 'files', 1);
 			return;
+		}
 
 		$r = sync_files($channel,$j);
 
-- 
cgit v1.2.3