From 84a3b3cd80942e314b8277e0646c6f057c6b33d8 Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 17 Feb 2017 09:42:31 -0200 Subject: [PATCH 1/9] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e615a9bc..6bba7deb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ deploy: provider: releases api_key: secure: FbZOk633cPQK70SwNHV29vddB48pQhZYXK6tBi6rNOQFCmtsRltiAZx1mn9cBA89yYcbiEGi8SKNTUKFAOtn8xsftXtRQbh7NLH+1S1rXoFLTKqd/e2K8V+I3qPnSIflXgw4jipkVJEtaTnYjjM39Dd9LYVlOfzTdDS3gePGOGKvLIx+T7nmzNTfPb/jVmBo9d68vlcMvDApMcocURXXHPK2Yoz4cjfGU1s674GOycoPPxE0Ovmdhj/PHLYqnSL0Q78UQ9luL8q6Lv15PeDKynpsi5ajm6p8p7DKp6ilvwWN+iKZA9ged8E8FbA7eLu3DA3pPmghph0dlRpYwbanosccTlbeFrNM6p3s6huxUzHt6Fkdzk5ubtz30FkA0LzvxwxOn6u1W4iTTI1Z1p07SpoyNrRw8wZY/hqcPkD+rDhQX1jmxfzaro8M0QRZ92cOI1nX3N8HRwMTZ2o+vMvaTvmHglfLN1aTpm3z/Pbp2gqj/uxE1aQlXKc3b+V5cGCEmsJKNp3TFhKyRdI7pMNF6E+vWfOLjTjif6h8Vy4nYkCX0C5h8eVmL6y8qfVMS1yATAM8B8K1dXvP3JaDKJoNUvH3VHgH/AxZGYHgycObU7GVUc/XhpCErBuMv1JZmLYE3tEGVFpt93RX2/MVmO8yp7/X6hxeIvfpsFUp2yk1q6k= - file: "pynocchio_0.1.1_amd64.deb" + file: "pynocchio_2.0.0_amd64.deb" skip_cleanup: true on: tags: true @@ -41,9 +41,8 @@ deploy: token: secure: 04F87fZmibN2FSgOp+2V/rI/Q44BXPsusTZ9lkWpaY1tDmaUyfvl9v0LtWWLlLE4NYOKiB6Ngi4aWmdQOU5jbGmCyzFlUHj7cX+KffNB3qkf+7VrL+9xPZL/77AiirGhvvVj6OvKG3uw9h9snGcATYkOhMWrJ+zOX3WcDp0xZklAWKcAg/NJSd8fbX2nLAEep0qrn+iotb9aQD4HirYiI6aj6J7ClEUWun77aJWSir6bdcI3RxJIDBuV7iOGqKOkS0botkXMIdlH7PAObP+zoNyG1N/3Xv0QaK/ZaUJ9ZyDwHMU/OcmclU+mHpoKuQpuxpIkNr+zEPRycQgRZxQ5/gXdLebp49SQxl/x//XKDt8EQYmFgpPhAcBlqVI3EYRalN8vryWf8GbFLFzAt5q0oX/iPcg+ZSBEMPl44R+q9BHZMH546YnT0lcUjpIOBotFzQhzdPzyWbF9Jp3T+0QXsvOUPPq4LrhqPDxLWFJbC4+itK49jZoabftUkc8lKQrlYVjwlkX1gWkbgJJdCsrGydvoDDeJhfdLhqAua1VaG/M4AZQtC69mtDnn3s9zwrvt48CyZD909ks7sdC4PBX1wUKZESuAozt/MSC4JE6OVxjaZEGfKuHBP+zuTn5BHq1UV1RD6F8NNrGEvnX8dJeXfGnpN4qnOAKt03cQFkaTWwc= skip_cleanup: true - file: "pynocchio_1.0.0_amd64.deb" + file: "pynocchio_2.0.0_amd64.deb" on: - tags: false repo: pynocchio/pynocchio branch: develop dist: From b16ca05c5a2141aa34adc2ecdfc9b8cef9f80a9e Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 17 Feb 2017 09:53:07 -0200 Subject: [PATCH 2/9] Update .travis.yml --- .travis.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bba7deb..5c9c15ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ dist: xenial install: - pip3 install -r requirements.txt - - sudo apt-get install upx build-essential git python3-dev python3-pip qt5-qmake qttools5-dev-tools libqt5sql5-sqlite unrar-free + - sudo apt-get install upx build-essential git python3-dev qt5-qmake qttools5-dev-tools libqt5sql5-sqlite unrar-free before_script: - export DISPLAY=:99.0 @@ -33,21 +33,6 @@ deploy: tags: true repo: pynocchio/pynocchio branch: master - -deploy: - provider: packagecloud - repository: "pynocchio" - username: "mstuttgart" - token: - secure: 04F87fZmibN2FSgOp+2V/rI/Q44BXPsusTZ9lkWpaY1tDmaUyfvl9v0LtWWLlLE4NYOKiB6Ngi4aWmdQOU5jbGmCyzFlUHj7cX+KffNB3qkf+7VrL+9xPZL/77AiirGhvvVj6OvKG3uw9h9snGcATYkOhMWrJ+zOX3WcDp0xZklAWKcAg/NJSd8fbX2nLAEep0qrn+iotb9aQD4HirYiI6aj6J7ClEUWun77aJWSir6bdcI3RxJIDBuV7iOGqKOkS0botkXMIdlH7PAObP+zoNyG1N/3Xv0QaK/ZaUJ9ZyDwHMU/OcmclU+mHpoKuQpuxpIkNr+zEPRycQgRZxQ5/gXdLebp49SQxl/x//XKDt8EQYmFgpPhAcBlqVI3EYRalN8vryWf8GbFLFzAt5q0oX/iPcg+ZSBEMPl44R+q9BHZMH546YnT0lcUjpIOBotFzQhzdPzyWbF9Jp3T+0QXsvOUPPq4LrhqPDxLWFJbC4+itK49jZoabftUkc8lKQrlYVjwlkX1gWkbgJJdCsrGydvoDDeJhfdLhqAua1VaG/M4AZQtC69mtDnn3s9zwrvt48CyZD909ks7sdC4PBX1wUKZESuAozt/MSC4JE6OVxjaZEGfKuHBP+zuTn5BHq1UV1RD6F8NNrGEvnX8dJeXfGnpN4qnOAKt03cQFkaTWwc= - skip_cleanup: true - file: "pynocchio_2.0.0_amd64.deb" - on: - repo: pynocchio/pynocchio - branch: develop - dist: - - "ubuntu/xenial" - - "linuxmint/sara" after_success: - python-codacy-coverage -c $TRAVIS_COMMIT -r coverage.xml From 6723eb9ac0553afd7c7b4c25521e0fce3cd2dc01 Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 17 Feb 2017 09:55:06 -0200 Subject: [PATCH 3/9] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0b5a9b89..8a7fafa1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ rarfile==2.8 peewee==2.8.1 PyQt5==5.7.1 coverage==4.2 -codacy-coverage==1.3.3 -PyInstaller==3.2 \ No newline at end of file +coveralls==1.1 +PyInstaller==3.2 From 5e36d57fdfa7a9a29e37a4e6bfb659094d9c5534 Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 17 Feb 2017 09:55:47 -0200 Subject: [PATCH 4/9] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c9c15ca..ece443aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ before_script: script: - coverage run --source=pynocchio setup.py test -- coverage xml - python setup.py build_pro - python setup.py build_ui - python setup.py build_deb @@ -35,4 +34,4 @@ deploy: branch: master after_success: - - python-codacy-coverage -c $TRAVIS_COMMIT -r coverage.xml + - coveralls From 7c1d975ce8fe532e2d509325fae2094241335c78 Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 17 Feb 2017 09:59:31 -0200 Subject: [PATCH 5/9] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 823235e0..c8b9e06b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ Pynocchio Comic Reader ================== [![Build Status](https://travis-ci.org/pynocchio/pynocchio.svg?branch=develop)](https://travis-ci.org/pynocchio/pynocchio) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a7dfde0bb92a486796cadbe70a036d09)](https://www.codacy.com/app/michellstut/pynocchio?utm_source=github.com&utm_medium=referral&utm_content=pynocchio/pynocchio&utm_campaign=Badge_Grade) -[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/a7dfde0bb92a486796cadbe70a036d09)](https://www.codacy.com/app/michellstut/pynocchio?utm_source=github.com&utm_medium=referral&utm_content=pynocchio/pynocchio&utm_campaign=Badge_Coverage) +[![Coverage Status](https://coveralls.io/repos/github/pynocchio/pynocchio/badge.svg?branch=develop)](https://coveralls.io/github/pynocchio/pynocchio?branch=develop) [![GitHub release](https://img.shields.io/github/release/pynocchio/pynocchio.svg)](https://github.com/pynocchio/pynocchio) [![license](https://img.shields.io/github/license/pynocchio/pynocchio.svg)](https://pt.wikipedia.org/wiki/GNU_General_Public_License) From 097203efe3f093186a9c6062d95827ee4db2b61f Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Sat, 18 Feb 2017 20:48:11 -0200 Subject: [PATCH 6/9] [FIX] Error to save image --- pynocchio/main_window_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pynocchio/main_window_view.py b/pynocchio/main_window_view.py index 0f267a5f..7cc8fc35 100644 --- a/pynocchio/main_window_view.py +++ b/pynocchio/main_window_view.py @@ -95,7 +95,7 @@ def on_action_save_image_triggered(self): if self.model.comic: path = self.model.current_directory + \ - self.model.comic.get_current_page_title() + self.model.get_current_page_title() file_path = QtWidgets.QFileDialog().getSaveFileName( self, self.tr('save_current_page'), path, self.tr("images (*.png *.xpm *.jpeg *.jpg *.gif)")) From fea1b557fd9f0cedcd47c66ccc0566d5ee031eea Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Fri, 24 Feb 2017 09:00:33 -0300 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8b9e06b..070a8bd4 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,4 @@ Pynocchio use [Elementary USU Icon Theme](https://store.kde.org/content/show.php ### Credits -Copyright (C) 2014-2016 by Michell Stuttgart Faria +Copyright (C) 2014-2017 by Michell Stuttgart Faria From e2f150ba56708fcbb941b2c304310e56ac1c3a5f Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Mon, 27 Feb 2017 00:37:28 -0300 Subject: [PATCH 8/9] [FIX] Error to open comic file: 'Cant open db' --- pynocchio/bookmark_database_manager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pynocchio/bookmark_database_manager.py b/pynocchio/bookmark_database_manager.py index 0662e36e..ab1183c1 100644 --- a/pynocchio/bookmark_database_manager.py +++ b/pynocchio/bookmark_database_manager.py @@ -33,8 +33,8 @@ class BookmarkManager(BookmarkBaseModel): @staticmethod def connect(): - db.connect() try: + db.connect() db.create_tables([Bookmark, TemporaryBookmark], safe=True) logger.info('Table Bookmark and TemporaryBookmark create/updates ' 'successfully!') @@ -43,8 +43,9 @@ def connect(): @staticmethod def close(): - db.close() - logger.info('Bookmark database closed.') + if not -db.is_closed(): + db.close() + logger.info('Bookmark database closed.') @staticmethod def add_bookmark(name, path, page, data=None, table=Bookmark): From 102aa3172231e1247a78d1ae41fd92ea93c75ab0 Mon Sep 17 00:00:00 2001 From: Michell Stuttgart Date: Mon, 27 Feb 2017 00:42:48 -0300 Subject: [PATCH 9/9] [NEW] Update version --- pynocchio/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pynocchio/version.py b/pynocchio/version.py index 6ad0be56..9be51c15 100644 --- a/pynocchio/version.py +++ b/pynocchio/version.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . -__version__ = '2.0.0' +__version__ = '2.0.1' # Version synonym VERSION = __version__