From 915d8369bf4eac652aa40615bdddc22af98b6653 Mon Sep 17 00:00:00 2001
From: MassiveAtoms <s.ramsaransing.w@gmail.com>
Date: Thu, 16 Jul 2020 12:43:58 -0300
Subject: [PATCH] better colab settings

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 3642 -> 3667 bytes
 .../CalibreWebCompanion/settings.py           |  59 +++++++------
 .../templates/library/book_detail.html        |  79 +++++++++---------
 3 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc
index aaa27cd4fccbb81cd6770d624e6005c69aa1f86e..cfb16f6265655d401db55168b309d6f2316ecb5f 100644
GIT binary patch
delta 646
zcmYjPOKTHR6u$S)on$hT$E0nVCY?5Y*J{)Fs@7*;sZbEXT2YRRAb#VJ8WKs`jhhH=
zL=e$&nMJbFeRuu}!IkqLx)E1`)H|Vy_i(@Oo^uc1cMsez&NnA{Kant*TF(yb%2DQh
z(rLfujDZmYhp2JleHJ8KzNdBNf2g~W9uI?}uHi<ZWf|lv@ot4;uIQR>Ox;-he%-a8
z=a|al>J-T_N+^yhPAWDOryj6nc9-q2hi!%!*)S;$3vnc1BH7WZoCZ#$;yvzh8bpeQ
zU{eNZ3}6sL$Y2;*j3DR5Xc&3QViXR>FpdHyFo`M8pb<=C2D6yMJWgQ&r*Q_0o=G_r
zDUYSlq1_!-vy^(m<FIiS=Wreua1qO%Ugfydk;>e`Wg5du|3P8*m7c)Wj`&xJ<Jw8(
zdPmSWZs4XTsDM?hDUDUE_i>|-n^o>fnn0N*u|-oz+cd4_no)Ze;vQSLb@-B(c_CS9
zx%>Ooy4PCTYc=WtZwA)p`t9wFovliFd&mE3E%-mhCvEq|tY4Cu!ynosog4n0*c%@8
zzsJ^i>M(CE@}apPTB)G%q*4h)qeU_l^LMSql|VM0yLB=ST5j`cwdMx0)_4qxhxuRY
zrl!71Q-+|25K-X2waWf4>nKtTD@Fe({&Aig!Vxw%xy=m~11Tw`CU`%7%VU`~kEJdn
I{^!JpKhxc$+5i9m

delta 620
zcmYk4O>YuW6o$EXE<<PNKub$Mr!A<peAy2Kp|x5lxM)%nQ*C0dq!Zwsj3|_bX&YhF
zrHQU|T(XdrKY)#K=Pz*Ku0Ozq3;%)ETTB|yoAczHHz()hCilDkMfdG%n(7kq<E`I#
z9eC%{&mIw%3oh;g0j(2GO!9($l>Q?#-92(CE)QG=Nz@)NJ_I*cAj1PuLFr00!qtB>
zrl&_N!o5)WFuYvDu;_dP`l0a=_~6F~MsXIv7{(FAgr)FNO!5GxFpU|^LdP8Dv0x4H
zF@zAtHC)FHEaE1X5JA*Z`8Z-ci1^^-gefD@qZWaNTUf>lR<VYp<*pIj?lN(H5-C1~
z^wsp89!2J9mtI*OWG^k@tamA&#s=<Ml+R!j_r#J-+#hgjz+8=3jL#y^b!_uF@uqo^
z3nD|Hk6qD1|1&9))s@0VY2P+mcIjc+wri(m{<zt&OT}jOq+uQ&+oeLeUaPds(5_&)
z)pm-~r|nMiB$7Rdw<?RRPWrk1Ds_5r(2ktcGgc&Zm?>w&sO0R}dZdxA+Oec@bkxqq
zJIY!zv%D&__N24u<XEsTv1e`~Ifn9vQ0J$TBWgdcCWtS5?lBBBtA=q-o3``Po6xwo
zkl)?e-g{saclMlb-lC&R5hpPGOOA@q(uz8=_F+lViA?APqs+}DN(TDPE|^cf5RQjQ
NvPAzd#rdke{|id`qQU?G

diff --git a/CalibreWebCompanion/CalibreWebCompanion/settings.py b/CalibreWebCompanion/CalibreWebCompanion/settings.py
index 7484635..bdbf8b4 100644
--- a/CalibreWebCompanion/CalibreWebCompanion/settings.py
+++ b/CalibreWebCompanion/CalibreWebCompanion/settings.py
@@ -11,16 +11,34 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
 """
 
 import os
+import json
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+with open( BASE_DIR + "/settings.json", "r") as userfile:
+    usersettings = json.load(userfile)
+    CALIBRE_DIR = os.path.abspath(usersettings["CALIBRE_DIR"])
+    SECRET_KEY = usersettings["SECRET_KEY"]
+    ALLOWED_HOSTS = usersettings["ALLOWED_HOSTS"]
+    INTERNAL_IPS = usersettings["INTERNAL_IPS"]
+
+
+# CALIBRE_DIR = os.path.abspath(
+#     "C:\\Users\\MassiveAtoms\\Documents\\Calibre Library")
+# SECRET_KEY = 'u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+'
+# ALLOWED_HOSTS = ['127.0.0.1', ]
+# INTERNAL_IPS = ['127.0.0.1', ]
+
+
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-CALIBRE_DIR = os.path.abspath(
-    "C:\\Users\\MassiveAtoms\\Documents\\Calibre Library")
+
+
+
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-
-
-# optimisation stuff
+# optimisation stuff ###############################################3
+#                                                                    #
 CONN_MAX_AGE = 60 * 5 
 
 CACHES = {
@@ -32,6 +50,9 @@ CACHES = {
     }
 }
 
+##                                                                    ##
+########################################################################
+##                    STATIC FILES                                    ##
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
@@ -42,23 +63,9 @@ STATICFILES_DIRS = [
 ]
 
 STATIC_URL = '/static/'
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret! 
-SECRET_KEY = 'u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+'
-
-
-ALLOWED_HOSTS = ['127.0.0.1', ]
-INTERNAL_IPS = [
-    # ...
-    '127.0.0.1',
-    # ...
-]
-
-
+##                                                                    ##
+########################################################################
+##                    DERUG                                           ##
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -76,9 +83,9 @@ DEBUG_TOOLBAR_PANELS = [
 ]
 
 
-
-
-
+##                                                                    ##
+########################################################################
+##                    DERUG                                           ##
 
 LOGIN_REDIRECT_URL = '/books'
 
diff --git a/CalibreWebCompanion/library/templates/library/book_detail.html b/CalibreWebCompanion/library/templates/library/book_detail.html
index 99750c7..ea795ac 100644
--- a/CalibreWebCompanion/library/templates/library/book_detail.html
+++ b/CalibreWebCompanion/library/templates/library/book_detail.html
@@ -6,46 +6,47 @@
 <div class="col s12 m7">
   <div class="card z-depth-0 horizontal">
     <div class="card-image">
-      <a style="padding-top:15%" href="{{download}}"><img src=" {% static "" %}{{imgpath}}" alt="download" srcset=""></a>
+      <a style="padding-top:15%" href=" {% static "" %}{{download}}"><img src=" {% static "" %}{{imgpath}}"
+          alt="download" srcset=""></a>
     </div>
     <div class="card-stacked">
       <div class="card-content">
-        <h1> {{book.title}}</h1> 
+        <h1> {{book.title}}</h1>
         <h4> by
-        {% if book.authors %}
-        {% for author in book.authors.all %}
-        <a href="{{author.get_absolute_url}}">{{author.name}}</a>
-        {%endfor%}
-        {% else %}
-        {{book.author_sort}}
-        {%endif%}
-        <br>
-        Published by 
-        {% if book.publishers %}
-        {% for pub in book.publishers.all %}
-        <a href="{{pub.get_absolute_url}}">{{pub.name}}</a>
-        {%endfor%}
-        {% else %}
-        Unknown
-        {%endif%}
-        <br>
-        Tags:   
-        {% if book.tags %}
-        {% for tag in book.tags.all %}
-        <a href="{{tag.get_absolute_url}}">{{tag.name}}</a>,
-        {%endfor%}
-        {% else %}
-        {%endif%}
-        <br>
-        Rating:   
-        {% if book.ratings %}
-        {% for rating in book.ratings.all %}
-        <a href="{{rating.get_absolute_url}}">{{rating}}</a>
-        {%endfor%}
-        {% else %}
-        {%endif%}
-        <br>
-        <a href="{{book.publisher.get_absolute_url}}">{{book.publisher}}</a>
+          {% if book.authors %}
+          {% for author in book.authors.all %}
+          <a href="{{author.get_absolute_url}}">{{author.name}}</a>
+          {%endfor%}
+          {% else %}
+          {{book.author_sort}}
+          {%endif%}
+          <br>
+          Published by
+          {% if book.publishers %}
+          {% for pub in book.publishers.all %}
+          <a href="{{pub.get_absolute_url}}">{{pub.name}}</a>
+          {%endfor%}
+          {% else %}
+          Unknown
+          {%endif%}
+          <br>
+          Tags:
+          {% if book.tags %}
+          {% for tag in book.tags.all %}
+          <a href="{{tag.get_absolute_url}}">{{tag.name}}</a>,
+          {%endfor%}
+          {% else %}
+          {%endif%}
+          <br>
+          Rating:
+          {% if book.ratings %}
+          {% for rating in book.ratings.all %}
+          <a href="{{rating.get_absolute_url}}">{{rating}}</a>
+          {%endfor%}
+          {% else %}
+          {%endif%}
+          <br>
+          <a href="{{book.publisher.get_absolute_url}}">{{book.publisher}}</a>
         </h4>
       </div>
     </div>
@@ -53,9 +54,9 @@
 </div>
 
 <div class="container">
-{% autoescape off %}
-{{comment}}
-{% endautoescape %}
+  {% autoescape off %}
+  {{comment}}
+  {% endautoescape %}
 </div>
 
 {% endblock %}
\ No newline at end of file