Merge branch 'release/2.0.1'

.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
@@ -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
@@ -27,28 +26,12 @@ 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
     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_1.0.0_amd64.deb"
-  on:
-    tags: false
-    repo: pynocchio/pynocchio
-    branch: develop
-  dist:
-    - "ubuntu/xenial"
-    - "linuxmint/sara"
 
 after_success:
- - python-codacy-coverage -c $TRAVIS_COMMIT -r coverage.xml
+ - coveralls

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)
 
@@ -35,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

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):

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)"))

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 <http://www.gnu.org/licenses/>.
 
-__version__ = '2.0.0'
+__version__ = '2.0.1'
 
 # Version synonym
 VERSION = __version__

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
+coveralls==1.1
+PyInstaller==3.2