From 8ee8a573f1f7e9cc45f9b3c46627d15670f14f3a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Sep 2018 20:47:17 +0200
Subject: Custom labels (#2027)

* First draft of custom tags

https://github.com/FreshRSS/FreshRSS/issues/928
https://github.com/FreshRSS/FreshRSS/issues/1367

* SMALLINT to BIGINT for id_entry

And uppercase SQL types

* Fix layout for unreads

* Start UI menu

* Change menu order

* Clean database helpers

https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r217971535

* Travis rules do not understand PostgreSQL constants

Grrr

* Tag controller + UI

* Add column attributes to tags

* Use only favicon for now, for label

* Fix styling for different themes

* Constant for maximum InnoDB index length in Unicode

https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r219052200
(I would have personnally prefered keeping the readability of a real
value instead of a constant, in this case of many SQL fields)

* Use FreshRSS_Factory::createCategoryDao

* Add view of all articles containing any tag

* Fix search in tags

* Mark as read tags

* Partial auto-update unread tags

* More auto update tag unreads

* Add tag deletion

* Do not purge tagged articles

* Minor comment

* Fix SQLite and UI bug

* Google Reader API support for user tags

Add SQL check that tag names must be distinct from category names

* whitespace

* Add missing API for EasyRSS

* Compatibility SQLite

Problematic parentheses

* Add SQL DISTINCT for cases with multiple tags

* Fix for PostgreSQL

PostgreSQL needs some additional type hint to avoid "could not determine
data type of parameter $1"

http://www.postgresql-archive.org/Could-not-determine-data-type-of-parameter-1-tp2171092p2171094.html
---
 cli/README.md     | 2 +-
 cli/user-info.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'cli')

diff --git a/cli/README.md b/cli/README.md
index c314bd388..148e15be5 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -72,7 +72,7 @@ cd /usr/share/FreshRSS
 # --user can be a username, or '*' to loop on all users
 # Returns: 1) a * iff the user is admin, 2) the name of the user,
 #  3) the date/time of last user action, 4) the size occupied,
-#  and the number of: 5) categories, 6) feeds, 7) read articles, 8) unread articles, and 9) favourites
+#  and the number of: 5) categories, 6) feeds, 7) read articles, 8) unread articles, 9) favourites, and 10) tags
 
 ./cli/db-optimize.php --user username
 # Optimize database (reduces the size) for a given user (perform `OPTIMIZE TABLE` in MySQL, `VACUUM` in SQLite)
diff --git a/cli/user-info.php b/cli/user-info.php
index 18a415217..043bebf7c 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -16,9 +16,10 @@ foreach ($users as $username) {
 	$username = cliInitUser($username);
 	echo $username === FreshRSS_Context::$system_conf->default_user ? '*' : ' ', "\t";
 
-	$catDAO = new FreshRSS_CategoryDAO();
+	$catDAO = FreshRSS_Factory::createCategoryDao();
 	$feedDAO = FreshRSS_Factory::createFeedDao($username);
 	$entryDAO = FreshRSS_Factory::createEntryDao($username);
+	$tagDAO = FreshRSS_Factory::createTagDao($username);
 	$databaseDAO = FreshRSS_Factory::createDatabaseDAO($username);
 
 	$nbEntries = $entryDAO->countUnreadRead();
@@ -34,6 +35,7 @@ foreach ($users as $username) {
 			$nbEntries['read'], " reads\t",
 			$nbEntries['unread'], " unreads\t",
 			$nbFavorites['all'], " favourites\t",
+			$tagDAO->count(), " tags\t",
 			"\n";
 	} else {
 		echo
@@ -45,6 +47,7 @@ foreach ($users as $username) {
 			$nbEntries['read'], "\t",
 			$nbEntries['unread'], "\t",
 			$nbFavorites['all'], "\t",
+			$tagDAO->count(), "\t",
 			"\n";
 	}
 }
-- 
cgit v1.2.3