Merge pull request #3 from janeczku/master

Keep fork updated

cps/db.py

@@ -230,6 +230,8 @@ class Data(Base):
 class Books(Base):
     __tablename__ = 'books'
 
+    DEFAULT_PUBDATE = "0101-01-01 00:00:00+00:00"
+
     id = Column(Integer, primary_key=True)
     title = Column(String)
     sort = Column(String)

cps/helper.py

@@ -176,7 +176,7 @@ def send_raw_email(kindle_mail, msg):
             mailserver.starttls()
 
         if settings["mail_password"]:
-            mailserver.login(settings["mail_login"], settings["mail_password"])
+            mailserver.login(str(settings["mail_login"]), str(settings["mail_password"]))
         mailserver.sendmail(settings["mail_from"], kindle_mail, msg)
         mailserver.quit()
 

cps/static/js/edit_books.js

@@ -1,8 +1,31 @@
 /**
  * Created by SpeedProg on 05.04.2015.
  */
-/* global Bloodhound */
+/* global Bloodhound, language, Modernizr, tinymce */
 
+tinymce.init({
+    selector: "#description",
+    branding: false,
+    menubar: "edit view format",
+    language
+});
+
+if (!Modernizr.inputtypes.date) {
+    $("#pubdate").datepicker({
+        format: "yyyy-mm-dd",
+        language
+    }).on("change", function () {
+        // Show localized date over top of the standard YYYY-MM-DD date
+        let pubDate;
+        const results = /(\d{4})[-\/\\](\d{1,2})[-\/\\](\d{1,2})/.exec(this.value); // YYYY-MM-DD
+        if (results) {
+            pubDate = new Date(results[1], parseInt(results[2], 10)-1, results[3]) || new Date(this.value);
+        }
+        $("#fake_pubdate")
+            .val(pubDate.toLocaleDateString(language))
+            .removeClass("hidden");
+    }).trigger("change");
+}
 
 /*
 Takes a prefix, query typeahead callback, Bloodhound typeahead adapter

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.de.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.de={days:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fre","Sam"],daysMin:["So","Mo","Di","Mi","Do","Fr","Sa"],months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",monthsTitle:"Monate",clear:"Löschen",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.es.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.es={days:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"],daysShort:["Dom","Lun","Mar","Mié","Jue","Vie","Sáb"],daysMin:["Do","Lu","Ma","Mi","Ju","Vi","Sa"],months:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],monthsShort:["Ene","Feb","Mar","Abr","May","Jun","Jul","Ago","Sep","Oct","Nov","Dic"],today:"Hoy",monthsTitle:"Meses",clear:"Borrar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.fr={days:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],daysShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],daysMin:["d","l","ma","me","j","v","s"],months:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthsShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.nl.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.nl={days:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"],daysShort:["zo","ma","di","wo","do","vr","za"],daysMin:["zo","ma","di","wo","do","vr","za"],months:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],monthsShort:["jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec"],today:"Vandaag",monthsTitle:"Maanden",clear:"Wissen",weekStart:1,format:"dd-mm-yyyy"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.pl.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.pl={days:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],daysShort:["Niedz.","Pon.","Wt.","Śr.","Czw.","Piąt.","Sob."],daysMin:["Ndz.","Pn.","Wt.","Śr.","Czw.","Pt.","Sob."],months:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],monthsShort:["Sty.","Lut.","Mar.","Kwi.","Maj","Cze.","Lip.","Sie.","Wrz.","Paź.","Lis.","Gru."],today:"Dzisiaj",weekStart:1,clear:"Wyczyść",format:"dd.mm.yyyy"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ru.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.ru={days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],daysShort:["Вск","Пнд","Втр","Срд","Чтв","Птн","Суб"],daysMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthsShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],today:"Сегодня",clear:"Очистить",format:"dd.mm.yyyy",weekStart:1,monthsTitle:"Месяцы"}}(jQuery);

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["zh-CN"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["周日","周一","周二","周三","周四","周五","周六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今日",clear:"清除",format:"yyyy年mm月dd日",titleFormat:"yyyy年mm月",weekStart:1}}(jQuery);

cps/templates/book_edit.html

@@ -52,6 +52,13 @@
       <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
     </div>
 
+    <div class="form-group">
+      <label for="pubdate">{{_('Publishing date')}}</label>
+      <div style="position: relative">
+        <input type="date" class="form-control" name="pubdate" id="pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdateinput}}{% endif %}">
+        <input type="text" class="form-control fake-input hidden" id="fake_pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdate}}{% endif %}">
+      </div>
+    </div>
     <div class="form-group">
       <label for="languages">{{_('Language')}}</label>
       <input type="text" class="form-control typeahead" name="languages" id="languages" value="{% for language in book.languages %}{{language.language_name.strip()}}, {% endfor %}">
@@ -183,21 +190,19 @@
     'description': {{_('Description')|safe|tojson}},
     'source': {{_('Source')|safe|tojson}},
   };
+  var language = '{{ g.user.locale }}';
 </script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/get_meta.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/tinymce/tinymce.min.js') }}"></script>
-<script type="text/javascript">
+<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
-  tinymce.init({
+{% if not g.user.locale == 'en' %}
-    selector: '#description',
+<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
-    branding: false,
+{% endif %}
-    menubar: 'edit view format',
+<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-    language: '{{ g.user.locale }}'
-  });
-</script>
 {% endblock %}
 {% block header %}
 <link href="{{ url_for('static', filename='css/libs/typeahead.css') }}" rel="stylesheet" media="screen">
+<link href="{{ url_for('static', filename='css/libs/bootstrap-datepicker3.min.css') }}" rel="stylesheet" media="screen">
 {% endblock %}

cps/templates/layout.html

@@ -181,6 +181,10 @@
           {% block body %}{% endblock %}
           {% if pagination and (pagination.has_next or pagination.has_prev) %}
             <div class="pagination">
+              {% if pagination.has_prev %}
+              <a class="previous" href="{{ url_for_other_page(pagination.page - 1)
+                }}">&laquo; {{_('Previous')}}</a>
+              {% endif %}
             {% for page in pagination.iter_pages() %}
               {% if page %}
                 {% if page != pagination.page %}
@@ -194,7 +198,7 @@
             {% endfor %}
             {% if pagination.has_next %}
               <a class="next" href="{{ url_for_other_page(pagination.page + 1)
-                }}">Next &raquo;</a>
+                }}">{{_('Next')}} &raquo;</a>
             {% endif %}
             </div>
           {% endif %}

cps/web.py

@@ -415,6 +415,14 @@ def formatdate(val):
     return format_date(formatdate, format='medium', locale=get_locale())
 
 
+@app.template_filter('formatdateinput')
+def format_date_input(val):
+    conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
+    date_obj = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
+    input_date = date_obj.isoformat().split('T', 1)[0] # Hack to support dates <1900
+    return '' if input_date == "0101-01-01" else input_date
+
+
 @app.template_filter('strftime')
 def timestamptodate(date, fmt=None):
     date = datetime.datetime.fromtimestamp(
@@ -2689,7 +2697,12 @@ def edit_book(book_id):
         lang_filter = True
     book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(lang_filter).first()
     author_names = []
-    if book:
+
+    # Book not found
+    if not book:
+        flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
+        return redirect(url_for("index"))
+
     for index in range(0, len(book.languages)):
         try:
             book.languages[index].language_name = LC.parse(book.languages[index].lang_code).get_language_name(
@@ -2698,7 +2711,13 @@ def edit_book(book_id):
             book.languages[index].language_name = _(isoLanguages.get(part3=book.languages[index].lang_code).name)
     for author in book.authors:
         author_names.append(author.name)
-        if request.method == 'POST':
+
+    # Show form
+    if request.method != 'POST':
+        return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,
+                                     title=_(u"edit metadata"))
+
+    # Update book
     edited_books_id = set()
     to_save = request.form.to_dict()
     if book.title != to_save["book_title"]:
@@ -2752,6 +2771,14 @@ def edit_book(book_id):
     input_languages = to_save["languages"].split(',')
     input_languages = map(lambda it: it.strip().lower(), input_languages)
 
+    if to_save["pubdate"]:
+        try:
+            book.pubdate = datetime.datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+        except ValueError:
+            book.pubdate = db.Books.DEFAULT_PUBDATE
+    else:
+        book.pubdate = db.Books.DEFAULT_PUBDATE
+
     # retranslate displayed text to language codes
     languages = db.session.query(db.Languages).all()
     input_l = []
@@ -2872,12 +2899,6 @@ def edit_book(book_id):
     else:
         return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,
                                      title=_(u"edit metadata"))
-        else:
-            return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,
-                                         title=_(u"edit metadata"))
-    else:
-        flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
-        return redirect(url_for("index"))
 
 
 @app.route("/upload", methods=["GET", "POST"])

requirements.txt

@@ -10,3 +10,4 @@ requests>=2.11.1
 SQLAlchemy>=0.8.4
 tornado>=4.1
 Wand>=0.4.4
+unidecode>=0.04.19