From bd40f6afdc6cd33765b0f0691ce2f073495dfbb4 Mon Sep 17 00:00:00 2001 From: geigi Date: Wed, 14 Feb 2018 19:34:26 +0100 Subject: [PATCH] Version bump for elementaryos only --- .gitignore | 5 ++++- cozy/book_element.py | 3 +++ cozy/db.py | 4 +++- data/com.github.geigi.cozy.appdata.xml | 15 +++++++++++++++ data/ui/book_progress_element.ui | 24 ++++++++++++------------ debian/changelog | 18 ++++++++++++++++-- meson.build | 2 +- 7 files changed, 54 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index a78fd8b1..8e9f100f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ app/ bin/ +cozy/__pycache__ debian/build/ debian/com.github.geigi.cozy.debhelper.log debian/com.github.geigi.cozy.substvars @@ -19,4 +20,6 @@ peewee/ .vscode/.ropeproject .vscode/tags .tx -*.log \ No newline at end of file +*.log +*.prof +*.pyc \ No newline at end of file diff --git a/cozy/book_element.py b/cozy/book_element.py index c9dad43f..88c766db 100644 --- a/cozy/book_element.py +++ b/cozy/book_element.py @@ -255,6 +255,7 @@ def __create_popover(self): self.duration_label = builder.get_object("duration_label") self.remaining_label = builder.get_object("remaining_label") self.remaining_text_label = builder.get_object("remaining_text_label") + self.played_text_label = builder.get_object("played_text_label") self.duration = get_book_duration(self.book) self.duration_label.set_text(tools.seconds_to_str(self.duration / self.ui.speed, False)) @@ -365,10 +366,12 @@ def update_time(self): if progress == 0 or remaining < 15: self.remaining_label.set_visible(False) self.remaining_text_label.set_visible(False) + self.played_text_label.set_visible(False) else: if not self.remaining_label.get_visible(): self.remaining_label.set_visible(True) self.remaining_text_label.set_visible(True) + self.played_text_label.set_visible(True) percentage = progress / self.duration diff --git a/cozy/db.py b/cozy/db.py index ad3d9c4b..cf6ed3c3 100644 --- a/cozy/db.py +++ b/cozy/db.py @@ -2,11 +2,14 @@ import logging import uuid +log = logging.getLogger("db") from peewee import __version__ as PeeweeVersion if PeeweeVersion[0] == '2': + log.info("Using peewee 2 backend") from peewee import BaseModel ModelBase = BaseModel else: + log.info("Using peewee 3 backend") from peewee import ModelBase from peewee import Model, CharField, IntegerField, BlobField, ForeignKeyField, FloatField, BooleanField, SqliteDatabase from playhouse.migrate import SqliteMigrator, migrate @@ -16,7 +19,6 @@ # first we get the data home and find the database if it exists data_dir = os.path.join(GLib.get_user_data_dir(), "cozy") -log = logging.getLogger("db") log.debug(data_dir) if not os.path.exists(data_dir): os.makedirs(data_dir) diff --git a/data/com.github.geigi.cozy.appdata.xml b/data/com.github.geigi.cozy.appdata.xml index a6389073..21f7391b 100644 --- a/data/com.github.geigi.cozy.appdata.xml +++ b/data/com.github.geigi.cozy.appdata.xml @@ -51,6 +51,21 @@ https://www.patreon.com/geigi cozy@geigi.de + + +
    +
  • Display the progress and remaining time of your books
    • +
  • Click on the remaining time ;)
    • +
  • Support for album art in image files (thanks to oleg-krv)
    • +
  • Faster startup! (introducing album art cache)
    • +
  • Fixed mp3 disk number on imports
    • +
  • More small bugfixes
    • +
  • Some UI tweaks (also thanks to jnbr)
    • +
  • Support for peewee3 (tanks to jnbr)
    • +
  • Chinese translation
    • +
+ +
    diff --git a/data/ui/book_progress_element.ui b/data/ui/book_progress_element.ui index b31def41..87fcf7e9 100644 --- a/data/ui/book_progress_element.ui +++ b/data/ui/book_progress_element.ui @@ -24,14 +24,15 @@ True False + center 5 3 - + True False - 21h32 - right + 5 + 4h32 False @@ -44,35 +45,34 @@ True False 5 - remaining + 5 + of False True - end 1 - + True False - 5 - 4h32 + 21h32 + right False True - end 2 - + True False 5 - total + played False @@ -83,7 +83,7 @@ False - True + False 1 diff --git a/debian/changelog b/debian/changelog index 6e8de520..bf34da4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +com.github.geigi.cozy (0.5.0) UNSTABLE; urgency=low + + * Display the progress and remaining time of your books + * Try clicking on the remaining time ;) + * Support for album art in image files (thanks to oleg-krv) + * Faster startup! (introducing album art cache) + * Fixed mp3 disk number on imports + * Other bugfixes + * Some UI tweaks (thanks to jnbr) + * Support for peewee3 (tanks to jnbr) + * Chinese translation + + -- Julian Geywitz Wed, 12 Feb 2018 18:35:14 +0200 + com.github.geigi.cozy (0.4.9) UNSTABLE; urgency=low * Display the progress and remaining time of your books @@ -7,7 +21,7 @@ com.github.geigi.cozy (0.4.9) UNSTABLE; urgency=low * Fixed mp3 disk number on imports * Other bugfixes * Some UI tweaks (thanks to jnbr) - * Support for peewee3 (tanks to jnbr)< + * Support for peewee3 (tanks to jnbr) * Chinese translation -- Julian Geywitz Wed, 12 Feb 2018 18:35:14 +0200 @@ -21,7 +35,7 @@ com.github.geigi.cozy (0.4.8) UNSTABLE; urgency=low * Fixed mp3 disk number on imports * Other bugfixes * Some UI tweaks (thanks to jnbr) - * Support for peewee3 (tanks to jnbr)< + * Support for peewee3 (tanks to jnbr) * Chinese translation -- Julian Geywitz Wed, 12 Feb 2018 18:35:14 +0200 diff --git a/meson.build b/meson.build index e9709741..22b95470 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cozy', - version: '0.4.9', + version: '0.5.0', meson_version: '>= 0.40.0') project_name = 'cozy'