From e811b461afdb35dd7d5fb8bdd5b98f0bf93dc13b Mon Sep 17 00:00:00 2001
From: Meutel <meutel@meutel.net>
Date: Wed, 3 Sep 2014 19:40:12 +0200
Subject: [PATCH] better handling of book details, use custom columns

---
 bouquins.js             |  1 +
 config/development.json | 13 ++++++++++++-
 routes/book.js          | 33 +++++++++++++++++++++------------
 views/book.jade         | 18 ++++++++++++++++--
 4 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/bouquins.js b/bouquins.js
index 833bfc2..409f974 100644
--- a/bouquins.js
+++ b/bouquins.js
@@ -42,6 +42,7 @@ var db = new sqlite3.Database(dbPath);
 
 app.use(function(req, res, next) {
 	req.db = db;
+	req.locals = app.locals;
 	next();
 });
 
diff --git a/config/development.json b/config/development.json
index 6123a77..f906e6c 100644
--- a/config/development.json
+++ b/config/development.json
@@ -1,5 +1,16 @@
 {
 	"calibre_path": "./public/calibre",
 	"calibre_db_path": "./public/calibre/metadata.db",
-	"trust proxy": true
+	"trust proxy": true,
+	"book_details_custom": [
+		{
+			"name": "a_lire",
+			"query": "SELECT custom_columns.name AS label, custom_column_2.value AS value FROM custom_column_2 LEFT OUTER JOIN custom_columns ON custom_columns.id = 2 WHERE custom_column_2.book = ?",
+			"type": "bool"
+		}, {
+			"name": "phy",
+			"query": "SELECT custom_columns.name AS label, custom_column_3.value AS value FROM custom_column_3 LEFT OUTER JOIN custom_columns ON custom_columns.id = 3 WHERE custom_column_3.book = ?",
+			"type": "bool"
+		}
+	]
 }
diff --git a/routes/book.js b/routes/book.js
index 81f8ec1..7ef89ce 100644
--- a/routes/book.js
+++ b/routes/book.js
@@ -151,7 +151,8 @@ router.post('/', function(req,res) {
 /* Single book */
 router.get('/:id', function(req, res) {
 	var book, authors, tags, details;
-	var queries = 4;
+	var queries = 3;
+	if (req.locals.book_details_custom) queries+=req.locals.book_details_custom.length;
 	var callback = function() {
 		if (queries == 0) {
 			book.authors = authors;
@@ -170,12 +171,14 @@ router.get('/:id', function(req, res) {
 	// book
 	req.db.get('SELECT books.id AS id,title,timestamp,pubdate,series_index,isbn,lccn,path,uuid,has_cover,' +
 		'languages.lang_code,format,uncompressed_size,data.name AS data_name,series.name AS series_name,' +
-		'series.id AS series_id FROM books ' +
+		'series.id AS series_id, publishers.name AS pubname FROM books ' +
 		' LEFT OUTER JOIN books_languages_link ON books_languages_link.book = books.id ' +
 		' LEFT OUTER JOIN languages ON languages.id = books_languages_link.lang_code ' +
 		' LEFT OUTER JOIN data ON data.book = books.id ' +
 		' LEFT OUTER JOIN books_series_link ON books.id = books_series_link.book ' +
 		' LEFT OUTER JOIN series ON series.id = books_series_link.series ' +
+		' LEFT OUTER JOIN books_publishers_link ON books.id = books_publishers_link.book ' +
+		' LEFT OUTER JOIN publishers ON publishers.id = books_publishers_link.publisher ' +
 		' WHERE books.id = ?', req.params.id,
 		function(err, row) {
 			if (err) console.log('ERR book: '+err);
@@ -210,16 +213,22 @@ router.get('/:id', function(req, res) {
 	);
 	// details
 	custom = new Array();
-	req.db.each('SELECT publishers.name as pubname FROM publishers, books_publishers_link WHERE books_publishers_link.publisher = publishers.id AND books_publishers_link.book = ?', req.params.id,
-		function(err, publisher) {
-			custom.push({name:'pubname',value:publisher.pubname});
-		},
-		function(err) {
-			if (err) console.log('ERR tags: '+err);
-			queries--;
-			callback();
-		}
-	);
+	if (req.locals.book_details_custom) {
+		_.each(req.locals.book_details_custom, function(detail) {
+			req.db.each(detail.query, req.params.id,
+				function(err, row) {
+					row.name = detail.name;
+					row.type = detail.type;
+					custom.push(row);
+				},
+				function(err) {
+					if (err) console.log('ERR tags: '+err);
+					queries--;
+					callback();
+				}
+			);
+		});
+	}
 });
 
 
diff --git a/views/book.jade b/views/book.jade
index 8259e44..60b49e6 100644
--- a/views/book.jade
+++ b/views/book.jade
@@ -48,11 +48,25 @@ block content
             li
               strong #{t('bouquins.book.detail.pubdate')}
               |  #{new Date(pubdate).getMonth()}-#{new Date(pubdate).getFullYear()}
+          if pubname
+            li
+              strong #{t('bouquins.book.detail.pubname')}
+              |  #{pubname}
           if custom
             each item in custom
               li
-                strong #{t('bouquins.book.detail.'+item.name)}
-                |  #{item.value}
+                if item.label
+                  strong #{item.label}
+                else
+                  strong #{t('bouquins.book.detail.'+item.name)}
+                case item.type
+                  when "bool"
+                    if item.value == 1
+                      span.glyphicon.glyphicon-ok
+                    else
+                      span.glyphicon.glyphicon-remove
+                  default
+                    |  #{item.value}
       div.col-md-7
         if has_cover == 1
           img.img-rounded.img-responsive(src='/calibre/'+path+'/cover.jpg',alt=t('bouquins.book.nocover'))