From 92db00692a8c1c651454f40acf09156f7096c1cf Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 10 May 2020 14:58:18 +0200
Subject: [PATCH] Merge all headers to download response Updated test results

---
 cps/helper.py                     |  4 +-
 test/Calibre-Web TestSummary.html | 78 ++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 2361838c..ee733983 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -609,7 +609,9 @@ def do_download_file(book, book_format, data, headers):
             # ToDo: improve error handling
             log.error('File not found: %s', os.path.join(filename, data.name + "." + book_format))
         response = make_response(send_from_directory(filename, data.name + "." + book_format))
-        response.headers = headers
+        # ToDo Check headers parameter
+        for element in headers:
+            response.headers[element[0]] = element[1]
         return response
 
 ##################################
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
index 4f560221..1a9fb744 100755
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-05-05 19:02:03</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-05-10 13:45:56</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-05-05 19:58:37</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-05-10 14:42:12</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>47:42 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>47:37 min</p>
         </div>
       </div>
       </div>
@@ -457,8 +457,8 @@
     <tr class="result['header']['style']">
         <td>test_edit_books.test_edit_books</td>
         <td class="text-center">30</td>
-        <td class="text-center">28</td>
-        <td class="text-center">0</td>
+        <td class="text-center">27</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -763,11 +763,33 @@
     
     
     
-        <tr id='pt5.30' class='hiddenRow bg-success'>
+        <tr id='ft5.30' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft5.30')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_ft5.30' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_ft5.30').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 654, in test_upload_cover_hdd
+    self.assertEqual('20317',resp.headers['Content-Length'])
+AssertionError: '20317' != '5232'
+- 20317
++ 5232</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1829,8 +1851,8 @@ AssertionError: False is not true : logfile config value is not empty after rese
     <tr class="result['header']['style']">
         <td>test_updater.test_updater</td>
         <td class="text-center">7</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1867,33 +1889,11 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='ft18.4' class='none bg-danger'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_versions</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft18.4' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft18.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_updater.py", line 150, in test_check_update_stable_versions
-    self.check_updater('latest version installed', "alert-warning")
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_updater.py", line 60, in check_updater
-    self.assertTrue(self.check_element_on_page((By.CLASS_NAME, className)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2520,6 +2520,12 @@ AssertionError: False is not true</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>comicapi</th>
+              <td>2.1</td>
+              <td>test_edit_additional_books</td>
+            </tr>
+          
             <tr>
               <th>lxml</th>
               <td>4.5.0</td>
@@ -2550,6 +2556,12 @@ AssertionError: False is not true</pre>
               <td>test_edit_books</td>
             </tr>
           
+            <tr>
+              <th>goodreads</th>
+              <td>0.3.2</td>
+              <td>test_goodreads</td>
+            </tr>
+          
             <tr>
               <th>jsonschema</th>
               <td>3.2.0</td>