mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

maybe broken again

Browse source
This commit is contained in:
Matthew Exon 2019-10-08 18:55:34 +02:00 committed by Matthew Exon
parent 945a01cfc9
commit ea8af51159
1 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
retriever/retriever.php
View file

@ -262,10 +262,8 @@ function retrieve_resource($resource) {
function get_retriever_rule($contact_id, $uid, $create = false) { function get_retriever_rule($contact_id, $uid, $create = false) {
$retriever_rule = DBA::selectFirst('retriever_rule', [], ['contact-id' => intval($contact_id), 'uid' => intval($uid)]); $retriever_rule = DBA::selectFirst('retriever_rule', [], ['contact-id' => intval($contact_id), 'uid' => intval($uid)]);
//@@@ check that this worked
if ($retriever_rule) { if ($retriever_rule) {
$retriever_rule['data'] = json_decode($retriever_rule['data'], true); $retriever_rule['data'] = json_decode($retriever_rule['data'], true);
Logger::info('@@@ get_retriever_rule returning an actual thing');
return $retriever_rule; return $retriever_rule;
} }
if ($create) { if ($create) {
@ -288,7 +286,7 @@ function retriever_get_item($retriever_item) {
return $item; return $item;
} }
function retriever_item_completed($retriever_item_id, $resource, $a) { function retriever_item_completed($a, $retriever_item_id, $resource) {
Logger::debug('retriever_item_completed: id ' . $retriever_item_id . ' url ' . $resource['url']); Logger::debug('retriever_item_completed: id ' . $retriever_item_id . ' url ' . $resource['url']);
$retriever_item = retriever_get_retriever_item($retriever_item_id); $retriever_item = retriever_get_retriever_item($retriever_item_id);
@ -313,7 +311,7 @@ function retriever_item_completed($retriever_item_id, $resource, $a) {
function retriever_resource_completed($resource, $a) { function retriever_resource_completed($resource, $a) {
Logger::debug('retriever_resource_completed: id ' . $resource['id'] . ' url ' . $resource['url']); Logger::debug('retriever_resource_completed: id ' . $resource['id'] . ' url ' . $resource['url']);
foreach (DBA::selectToArray('retriever_item', ['id'], ['resource' => intval($resource['id'])]) as $retriever_item) { foreach (DBA::selectToArray('retriever_item', ['id'], ['resource' => intval($resource['id'])]) as $retriever_item) {
retriever_item_completed($retriever_item['id'], $resource, $a); //@@@ args in wrong order retriever_item_completed($a, $retriever_item['id'], $resource);
} }
} }
@ -358,6 +356,7 @@ function retriever_on_item_insert($a, $retriever, &$item) {
} }
$resource = add_retriever_resource($a, $url, $item['uid'], $item['contact-id']); $resource = add_retriever_resource($a, $url, $item['uid'], $item['contact-id']);
Logger::debug('@@@ check this makes sense: ' . $resource['id'] . ' url ' . $resource['url']);
$retriever_item_id = add_retriever_item($item, $resource); $retriever_item_id = add_retriever_item($item, $resource);
} }
@ -374,7 +373,6 @@ function add_retriever_resource($a, $url, $uid, $cid, $binary = false) {
$url = 'md5://' . hash('md5', $url); $url = 'md5://' . hash('md5', $url);
if (DBA::selectFirst('retriever_resource', [], ['url' => $url, 'item-uid' => intval($uid), 'contact-id' => intval($cid)])) { if (DBA::selectFirst('retriever_resource', [], ['url' => $url, 'item-uid' => intval($uid), 'contact-id' => intval($cid)])) {
//@@@ test that this really happens - it should sometimes
Logger::debug('add_retriever_resource: Resource ' . $url . ' already requested'); Logger::debug('add_retriever_resource: Resource ' . $url . ' already requested');
return $resource; return $resource;
} }
@ -390,10 +388,7 @@ function add_retriever_resource($a, $url, $uid, $cid, $binary = false) {
intval($binary ? 1 : 0), intval($binary ? 1 : 0),
DBA::escape($url), DBA::escape($url),
DBA::escape($data)); DBA::escape($data));
//@@@ fix this if (DBA::selectFirst('retriever_resource', [], ['url' => $url])) {
$r = q("SELECT * FROM `retriever_resource` WHERE `url` = '%s'", DBA::escape($url));
$resource = $r[0];
if (count($r)) {
retriever_resource_completed($resource, $a); retriever_resource_completed($resource, $a);
} }
return $resource; return $resource;
@ -403,19 +398,15 @@ function add_retriever_resource($a, $url, $uid, $cid, $binary = false) {
Logger::warning('add_retriever_resource: URL is longer than 800 characters'); Logger::warning('add_retriever_resource: URL is longer than 800 characters');
} }
//@@@ fix this if (DBA::selectFirst('retriever_resource', [], ['url' => $url, 'item-uid' => intval($uid), 'contact-id' => intval($cid)])) {
$r = q("SELECT * FROM `retriever_resource` WHERE `url` = '%s' AND `item-uid` = %d AND `contact-id` = %d", DBA::escape($url), intval($uid), intval($cid));
if (count($r)) {
Logger::debug('add_retriever_resource: Resource ' . $url . ' uid ' . $uid . ' cid ' . $cid . ' already requested'); Logger::debug('add_retriever_resource: Resource ' . $url . ' uid ' . $uid . ' cid ' . $cid . ' already requested');
return $r[0]; return $r[0];
} }
//@@@ fix this DBA::insert('retriever_rule', ['item-uid' => intval($uid), 'contact-id' => intval($cid), 'binary' => ($binary ? 1 : 0), 'url' => $url]);
q("INSERT INTO `retriever_resource` (`item-uid`, `contact-id`, `binary`, `url`) " . Logge::debug('@@@ add_retriever_resource inserting resource ' . $url . ' uid ' . $uid . ' cid ' . $cid);
"VALUES (%d, %d, %d, '%s')", intval($uid), intval($cid), intval($binary ? 1 : 0), DBA::escape($url)); //@@@ check the insert worked
//@@@ fix this return DBA::selectFirst('retriever_resource', [], ['url' => $url, 'item-uid' => intval($uid), 'contact-id' => intval($cid)]);
$r = q("SELECT * FROM `retriever_resource` WHERE `url` = '%s'", DBA::escape($url));
return $r[0];
} }
function add_retriever_item(&$item, $resource) { function add_retriever_item(&$item, $resource) {
@ -557,7 +548,7 @@ function retriever_globalise_urls($doc, $resource) {
return $doc; return $doc;
} }
function retrieve_images(&$item, $a) { function retrieve_images($a, &$item) {
// Note that $item doesn't necessarily contain all the fields you would expect, in particular 'id' // Note that $item doesn't necessarily contain all the fields you would expect, in particular 'id'
//@@@ doe sit contain uri-id? //@@@ it definitely does not //@@@ doe sit contain uri-id? //@@@ it definitely does not
@ -580,6 +571,7 @@ function retrieve_images(&$item, $a) {
foreach ($matches as $url) { foreach ($matches as $url) {
if (strpos($url, get_app()->getBaseUrl()) === FALSE) { if (strpos($url, get_app()->getBaseUrl()) === FALSE) {
$resource = add_retriever_resource($a, $url, $item['uid'], $item['contact-id'], true); $resource = add_retriever_resource($a, $url, $item['uid'], $item['contact-id'], true);
Logger::debug('@@@ check this makes sense 2: ' . $resource['id'] . ' url ' . $resource['url']);
if (!$resource['completed']) { if (!$resource['completed']) {
add_retriever_item($item, $resource); add_retriever_item($item, $resource);
} }
@ -592,6 +584,8 @@ function retrieve_images(&$item, $a) {
function retriever_check_item_completed(&$item) function retriever_check_item_completed(&$item)
{ {
$waiting = DBA::selectFirst('retriever_item', [], ['item-uri' => $item['uri'], 'item-uid' => intval($item['uid']), 'contact-id' => intval($item['contact-id']), 'finished' => 0]);
Logger::debug('@@@ waiting is ' . $waiting);
// TODO: figure out how to do this with DBA module //@@@ selectFirst works // TODO: figure out how to do this with DBA module //@@@ selectFirst works
$r = q('SELECT count(*) FROM retriever_item WHERE `item-uri` = "%s" ' . $r = q('SELECT count(*) FROM retriever_item WHERE `item-uri` = "%s" ' .
'AND `item-uid` = %d AND `contact-id` = %d AND `finished` = 0', 'AND `item-uid` = %d AND `contact-id` = %d AND `finished` = 0',
@ -610,19 +604,17 @@ function retriever_check_item_completed(&$item)
function retriever_apply_completed_resource_to_item($retriever, &$item, $resource, $a) { function retriever_apply_completed_resource_to_item($retriever, &$item, $resource, $a) {
Logger::debug('retriever_apply_completed_resource_to_item: retriever ' . ($retriever ? $retriever['id'] : 'none') . ' resource ' . $resource['url'] . ' plink ' . $item['plink']); Logger::debug('retriever_apply_completed_resource_to_item: retriever ' . ($retriever ? $retriever['id'] : 'none') . ' resource ' . $resource['url'] . ' plink ' . $item['plink']);
if (strpos($resource['type'], 'image') !== false) { if (strpos($resource['type'], 'image') !== false) {
Logger::info('@@@ retriever_apply_completed_resource_to_item this is an image must transform');
retriever_transform_images($a, $item, $resource); retriever_transform_images($a, $item, $resource);
} }
if (!$retriever) { if (!$retriever) {
//@@@ log line here: how normal is this? Logger::warning('retriever_apply_completed_resource_to_item: no retriever');
Logger::info('@@@ retriever_apply_completed_resource_to_item no retriever');
return; return;
} }
if ((strpos($resource['type'], 'html') !== false) || if ((strpos($resource['type'], 'html') !== false) ||
(strpos($resource['type'], 'xml') !== false)) { (strpos($resource['type'], 'xml') !== false)) {
retriever_apply_dom_filter($retriever, $item, $resource); retriever_apply_dom_filter($retriever, $item, $resource);
if ($retriever['data']['images'] ) { if ($retriever['data']['images'] ) {
retrieve_images($item, $a); retrieve_images($a, $item);
} }
} }
} }
@ -716,9 +708,8 @@ function retriever_content($a) {
unset($retriever_rule['data']['exclude'][$k]); unset($retriever_rule['data']['exclude'][$k]);
} }
} }
//@@@ fix me //@@@ check that this works
q("UPDATE `retriever_rule` SET `data`='%s' WHERE `id` = %d", DBA::update('retriever_rule', ['data' => json_encode($retriever_rule['data'])], ['id' => intval($retriever_rule["id"])], ['data' => '']);
DBA::escape(json_encode($retriever_rule['data'])), intval($retriever_rule["id"]));
$a->page['content'] .= "<p><b>Settings Updated"; $a->page['content'] .= "<p><b>Settings Updated";
if (!empty($_POST["retriever_retrospective"])) { if (!empty($_POST["retriever_retrospective"])) {
apply_retrospective($a, $retriever_rule, $_POST["retriever_retrospective"]); apply_retrospective($a, $retriever_rule, $_POST["retriever_retrospective"]);
@ -821,7 +812,7 @@ function retriever_post_remote_hook(&$a, &$item) {
} }
} }
if (PConfig::get($item["uid"], 'retriever', 'all_photos')) { if (PConfig::get($item["uid"], 'retriever', 'all_photos')) {
retrieve_images($item, $a); //@@@ backwards retrieve_images($a, $item);
} }
} }
retriever_check_item_completed($item); retriever_check_item_completed($item);