banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor opml import/export code

Browse Source 
fix opml to properly handle nested categories
allow creating categories with same name in different parent categories
master
Andrew Dolgov 12 years ago
parent 3a9d5c6e88
commit d2a317e3c8
2 changed files with 232 additions and 267 deletions
Show Stats Download Patch File Download Diff File

36
include/functions.php
Unescape Escape View File

@ -4293,21 +4293,49 @@
} }
} }
function add_feed_category($link, $feed_cat) { function get_feed_category($link, $feed_cat, $parent_cat_id = false) {
if ($parent_cat_id) {
$parent_qpart = "parent_cat = '$parent_cat_id'";
$parent_insert = "'$parent_cat_id'";
} else {
$parent_qpart = "parent_cat IS NULL";
$parent_insert = "NULL";
}
$result = db_query($link,
"SELECT id FROM ttrss_feed_categories
WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) == 0) {
return false;
} else {
return db_fetch_result($result, 0, "id");
}
}
function add_feed_category($link, $feed_cat, $parent_cat_id = false) {
if (!$feed_cat) return false; if (!$feed_cat) return false;
db_query($link, "BEGIN"); db_query($link, "BEGIN");
if ($parent_cat_id) {
$parent_qpart = "parent_cat = '$parent_cat_id'";
$parent_insert = "'$parent_cat_id'";
} else {
$parent_qpart = "parent_cat IS NULL";
$parent_insert = "NULL";
}
$result = db_query($link, $result = db_query($link,
"SELECT id FROM ttrss_feed_categories "SELECT id FROM ttrss_feed_categories
WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]); WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
$result = db_query($link, $result = db_query($link,
"INSERT INTO ttrss_feed_categories (owner_uid,title) "INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat)
VALUES ('".$_SESSION["uid"]."', '$feed_cat')"); VALUES ('".$_SESSION["uid"]."', '$feed_cat', $parent_insert)");
db_query($link, "COMMIT"); db_query($link, "COMMIT");

329
opml.php
Unescape Escape View File

@ -13,130 +13,76 @@
if (!init_connection($link)) return; if (!init_connection($link)) return;
function opml_import_domdoc($link, $owner_uid) { function opml_import_feed($link, $doc, $node, $cat_id, $owner_uid) {
$attrs = $node->attributes;
if (is_file($_FILES['opml_file']['tmp_name'])) {
$doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = 'Imported feeds' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 1) {
$default_cat_id = db_fetch_result($result, 0, "id");
} else {
$default_cat_id = 0;
}
// Keep imported categories in order, after any pre-existing ones.
$new_cat_order_id = 0;
// Get the highest category order_id in use.
$result = db_query($link, "SELECT order_id FROM
ttrss_feed_categories WHERE owner_uid = '$owner_uid'
ORDER BY order_id DESC LIMIT 1");
if (db_num_rows($result) == 1) {
$new_cat_order_id = db_fetch_result($result, 0, "order_id");
}
if ($doc) { $feed_title = db_escape_string($attrs->getNamedItem('text')->nodeValue);
$body = $doc->getElementsByTagName('body'); if (!$feed_title) $feed_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
$xpath = new DOMXpath($doc);
$query = "/opml/body//outline";
$outlines = $xpath->query($query);
foreach ($outlines as $outline) {
$attributes = $outline->attributes;
$feed_title = db_escape_string($attributes->getNamedItem('text')->nodeValue);
if (!$feed_title) $feed_title = db_escape_string($attributes->getNamedItem('title')->nodeValue);
$cat_title = db_escape_string($attributes->getNamedItem('title')->nodeValue); $feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
if (!$cat_title) $cat_title = db_escape_string($attributes->getNamedItem('text')->nodeValue); if (!$feed_url) $feed_url = db_escape_string($attrs->getNamedItem('xmlURL')->nodeValue);
$feed_url = db_escape_string($attributes->getNamedItem('xmlUrl')->nodeValue); $site_url = db_escape_string($attrs->getNamedItem('htmlUrl')->nodeValue);
if (!$feed_url) $feed_url = db_escape_string($attributes->getNamedItem('xmlURL')->nodeValue);
$site_url = db_escape_string($attributes->getNamedItem('htmlUrl')->nodeValue); if ($feed_url && $feed_title) {
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
$pref_name = db_escape_string($attributes->getNamedItem('pref-name')->nodeValue); feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
$label_name = db_escape_string($attributes->getNamedItem('label-name')->nodeValue);
$filter_name = db_escape_string($attributes->getNamedItem('filter-name')->nodeValue);
if ($cat_title && !$feed_url) {
if ($cat_title != "tt-rss-prefs" && $cat_title != 'tt-rss-labels' && $cat_title != 'tt-rss-filters') {
db_query($link, "BEGIN");
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$cat_title' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
$cat_order_id = ++$new_cat_order_id; #opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
opml_notice(T_sprintf("Adding feed: %s", $feed_title));
printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title); $query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
('$feed_title', '$feed_url', '$owner_uid',
'$cat_id', '$site_url', 0)";
db_query($link, $query);
db_query($link, "INSERT INTO ttrss_feed_categories } else {
(title,owner_uid,order_id) opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
VALUES ('$cat_title', '$owner_uid', '$cat_order_id')");
} }
db_query($link, "COMMIT");
} }
} }
// print "$active_category : $feed_title : $feed_url<br>"; function opml_import_label($link, $doc, $node, $owner_uid) {
$attrs = $node->attributes;
if ($pref_name) { $label_name = db_escape_string($attrs->getNamedItem('label-name')->nodeValue);
$parent_node = $outline->parentNode;
if ($parent_node && $parent_node->nodeName == "outline") {
$cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue;
if ($cat_check == "tt-rss-prefs") {
$pref_value = db_escape_string($outline->attributes->getNamedItem('value')->nodeValue);
printf("<li>". if ($label_name) {
__("Setting preference key %s to %s")."</li>", $fg_color = db_escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
$pref_name, $pref_value); $bg_color = db_escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
set_pref($link, $pref_name, $pref_value);
if (!label_find_id($link, $label_name, $_SESSION['uid'])) {
opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
label_create($link, $label_name, $fg_color, $bg_color);
} else {
opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
} }
} }
} }
if ($label_name) { function opml_import_preference($link, $doc, $node, $owner_uid) {
$parent_node = $outline->parentNode; $attrs = $node->attributes;
$pref_name = db_escape_string($attrs->getNamedItem('pref-name')->nodeValue);
if ($parent_node && $parent_node->nodeName == "outline") { if ($pref_name) {
$cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue; $pref_value = db_escape_string($attrs->getNamedItem('value')->nodeValue);
if ($cat_check == "tt-rss-labels") {
$fg_color = db_escape_string($attributes->getNamedItem('label-fg-color')->nodeValue); opml_notice(T_sprintf("Setting preference key %s to %s",
$bg_color = db_escape_string($attributes->getNamedItem('label-bg-color')->nodeValue); $pref_name, $pref_value));
if (!label_find_id($link, $label_name, $_SESSION['uid'])) { set_pref($link, $pref_name, $pref_value);
printf("<li>".__("Adding label %s")."</li>", htmlspecialchars($label_name));
label_create($link, $label_name, $fg_color, $bg_color);
} else {
printf("<li>".__("Duplicate label: %s")."</li>",
htmlspecialchars($label_name));
}
}
} }
} }
function opml_import_filter($link, $doc, $node, $owner_uid) {
$attrs = $node->attributes;
$filter_name = db_escape_string($attrs->getNamedItem('filter-name')->nodeValue);
if ($filter_name) { if ($filter_name) {
$parent_node = $outline->parentNode;
if ($parent_node && $parent_node->nodeName == "outline") { $filter = json_decode($node->nodeValue, true);
$cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue;
if ($cat_check == "tt-rss-filters") {
$filter = json_decode($outline->nodeValue, true);
if ($filter) { if ($filter) {
$reg_exp = db_escape_string($filter['reg_exp']); $reg_exp = db_escape_string($filter['reg_exp']);
@ -177,7 +123,7 @@
$cat_id = "NULL"; $cat_id = "NULL";
} }
printf("<li>".__("Adding filter %s")."</li>", htmlspecialchars($reg_exp)); opml_notice(T_sprintf("Adding filter %s", htmlspecialchars($reg_exp)));
$query = "INSERT INTO ttrss_filters (filter_type, action_id, $query = "INSERT INTO ttrss_filters (filter_type, action_id,
enabled, inverse, action_param, filter_param, enabled, inverse, action_param, filter_param,
@ -193,106 +139,107 @@
db_query($link, $query); db_query($link, $query);
} else { } else {
printf("<li>".__("Duplicate filter %s")."</li>", htmlspecialchars($reg_exp)); opml_notice(T_sprintf("Duplicate filter %s", htmlspecialchars($reg_exp)));
}
} }
} }
} }
} }
if (!$feed_title || !$feed_url) continue; function opml_import_category($link, $doc, $root_node, $owner_uid, $parent_id) {
$body = $doc->getElementsByTagName('body');
db_query($link, "BEGIN");
$cat_id = null;
$parent_node = $outline->parentNode; $default_cat_id = (int) get_feed_category($link, 'Imported feeds', false);
if ($parent_node && $parent_node->nodeName == "outline") { if ($root_node) {
$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue; $cat_title = db_escape_string($root_node->attributes->getNamedItem('title')->nodeValue);
if (!$element_category) $element_category = $parent_node->attributes->getNamedItem('text')->nodeValue;
if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
$cat_id = get_feed_category($link, $cat_title, $parent_id);
db_query($link, "BEGIN");
if ($cat_id === false) {
add_feed_category($link, $cat_title, $parent_id);
$cat_id = get_feed_category($link, $cat_title, $parent_id);
}
db_query($link, "COMMIT");
} else { } else {
$element_category = ''; $cat_id = 0;
} }
if ($element_category) { $outlines = $root_node->childNodes;
$element_category = db_escape_string($element_category);
$result = db_query($link, "SELECT id FROM } else {
ttrss_feed_categories WHERE title = '$element_category' AND $xpath = new DOMXpath($doc);
owner_uid = '$owner_uid' LIMIT 1"); $outlines = $xpath->query("//opml/body/outline");
if (db_num_rows($result) == 1) { $cat_id = 0;
$cat_id = db_fetch_result($result, 0, "id");
}
} }
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE #opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
feed_url = '$feed_url' opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
AND owner_uid = '$owner_uid'");
print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> foreach ($outlines as $node) {
(<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;"; if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
$attrs = $node->attributes;
$node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
if (db_num_rows($result) > 0) { if ($node->hasChildNodes() && $node_cat_title) {
print __('is already imported.'); opml_import_category($link, $doc, $node, $owner_uid, $cat_id);
} else { } else {
// Get max order_id already in use. Increment.
$new_feed_order_id = 0; // these start at zero
$cat_id_qpart = $cat_id ? "cat_id = '$cat_id'" : "cat_id = '$default_cat_id'";
$result = db_query($link, "SELECT order_id FROM
ttrss_feeds WHERE owner_uid = '$owner_uid' AND $cat_id_qpart
ORDER BY order_id DESC LIMIT 1");
if (db_num_rows($result) == 1) {
$new_feed_order_id = db_fetch_result($result, 0, "order_id");
$new_feed_order_id++;
}
if ($cat_id) {
$add_query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
('$feed_title', '$feed_url', '$owner_uid',
'$cat_id', '$site_url', '$new_feed_order_id')";
if (!$cat_id) {
$dst_cat_id = $default_cat_id;
} else { } else {
$add_query = "INSERT INTO ttrss_feeds $dst_cat_id = $cat_id;
(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES }
('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
'$site_url', '$new_feed_order_id')";
switch ($cat_title) {
case "tt-rss-prefs":
opml_import_preference($link, $doc, $node, $owner_uid);
break;
case "tt-rss-labels":
opml_import_label($link, $doc, $node, $owner_uid);
break;
case "tt-rss-filters":
opml_import_filter($link, $doc, $node, $owner_uid);
break;
default:
opml_import_feed($link, $doc, $node, $dst_cat_id, $owner_uid);
}
}
}
}
} }
//print $add_query; function opml_import_domdoc($link, $owner_uid) {
db_query($link, $add_query);
print __('OK'); $debug = isset($_REQUEST["debug"]);
} $doc = false;
print "</li>"; if ($debug) $doc = DOMDocument::load("/tmp/test.opml");
db_query($link, "COMMIT"); if (is_file($_FILES['opml_file']['tmp_name'])) {
$doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
} else if (!$doc) {
print_error(__('Error: please upload OPML file.'));
return;
} }
if ($doc) {
opml_import_category($link, $doc, false, $owner_uid);
} else { } else {
print_error(__('Error while parsing document.')); print_error(__('Error while parsing document.'));
} }
} else {
print_error(__('Error: please upload OPML file.'));
}
} }
function opml_export_category($link, $owner_uid, $cat_id, $hide_private_feeds=false) { function opml_export_category($link, $owner_uid, $cat_id, $hide_private_feeds=false) {
if ($cat_id) if ($cat_id) {
$cat_qpart = "parent_cat = '$cat_id'"; $cat_qpart = "parent_cat = '$cat_id'";
else $feed_cat_qpart = "cat_id = '$cat_id'";
} else {
$cat_qpart = "parent_cat IS NULL"; $cat_qpart = "parent_cat IS NULL";
$feed_cat_qpart = "cat_id IS NULL";
}
if ($hide_private_feeds) if ($hide_private_feeds)
$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')"; $hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
@ -301,43 +248,31 @@
$out = ""; $out = "";
$query = "SELECT if ($cat_id) {
ttrss_feeds.title, feed_url, site_url, ttrss_feeds.order_id, $result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
ttrss_feed_categories.id AS cat_id, AND owner_uid = '$owner_uid'");
ttrss_feed_categories.title AS cat_title, $cat_title = db_fetch_result($result, 0, "title");
ttrss_feed_categories.order_id AS cat_order_id }
FROM ttrss_feeds LEFT JOIN ttrss_feed_categories ON (ttrss_feed_categories.id = ttrss_feeds.cat_id)
WHERE ttrss_feeds.owner_uid = '$owner_uid' AND $hide_qpart AND $cat_qpart
ORDER BY cat_order_id, cat_title, ttrss_feeds.order_id, title";
#$out .= "<!-- $query -->";
$result = db_query($link, $query); if ($cat_title) $out .= "<outline title=\"$cat_title\">\n";
$old_cat_title = ""; $result = db_query($link, "SELECT id,title
FROM ttrss_feed_categories WHERE
$cat_qpart AND owner_uid = '$owner_uid' ORDER BY order_id, title");
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
$title = htmlspecialchars($line["title"]); $title = htmlspecialchars($line["title"]);
$url = htmlspecialchars($line["feed_url"]); $out .= opml_export_category($link, $owner_uid, $line["id"], $hide_private_feeds);
$site_url = htmlspecialchars($line["site_url"]);
$cat_title = htmlspecialchars($line["cat_title"]);
if ($old_cat_title != $cat_title) {
if ($old_cat_title) {
$out .= "</outline>\n";
} }
if ($cat_title) { $feeds_result = db_query($link, "select title, feed_url, site_url
$out .= "<outline title=\"$cat_title\" text=\"$cat_title\" >\n"; from ttrss_feeds where $feed_cat_qpart AND owner_uid = '$owner_uid' AND $hide_qpart
} order by order_id, title");
$old_cat_title = $cat_title;
$cat_id = (int) $line["cat_id"]; while ($fline = db_fetch_assoc($feeds_result)) {
$title = htmlspecialchars($fline["title"]);
if ($cat_id > 0) $url = htmlspecialchars($fline["feed_url"]);
$out .= opml_export_category($link, $owner_uid, $cat_id, $hide_private_feeds); $site_url = htmlspecialchars($fline["site_url"]);
}
if ($site_url) { if ($site_url) {
$html_url_qpart = "htmlUrl=\"$site_url\""; $html_url_qpart = "htmlUrl=\"$site_url\"";
@ -346,12 +281,9 @@
} }
$out .= "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n"; $out .= "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
} }
if ($old_cat_title) { if ($cat_title) $out .= "</outline>\n";
$out .= "</outline>\n";
}
return $out; return $out;
} }
@ -531,7 +463,8 @@
db_query($link, "COMMIT"); db_query($link, "COMMIT");
print "<p>".__("Importing OPML...")."</p>"; opml_notice(__("Importing OPML..."));
opml_import_domdoc($link, $owner_uid); opml_import_domdoc($link, $owner_uid);
print "<br><form method=\"GET\" action=\"prefs.php\"> print "<br><form method=\"GET\" action=\"prefs.php\">
@ -544,4 +477,8 @@
// if ($link) db_close($link); // if ($link) db_close($link);
function opml_notice($msg) {
print "$msg<br/>";
}
?> ?>

Write Preview
Loading…
Cancel
Save