test pull request

.github/workflows/pythonapp.yml

@@ -0,0 +1,37 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --ignore=E225,E226,E231,E265,E302,E722,F401,F403,F405,C901 --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pip install pytest
+        pytest

bin/qtodotxt.pyw

@@ -5,9 +5,10 @@ import os
 import sys
 
 try:
-  __file__
+    __file__
 except NameError:
-  __file__ = sys.argv[0]
+    __file__ = sys.argv[0]
+
 
 def reroute_py2exe_logs():
     appdata = os.path.expandvars("%AppData%\\QTodoTxt")
@@ -16,16 +17,15 @@ def reroute_py2exe_logs():
     sys.stdout = open(appdata + "\\stdout.log", "w")
     sys.stderr = open(appdata + "\\stderr.log", "w")
 
+
 if sys.argv[0].lower().endswith('.exe'):
-# If something goes wrong, logging information might help.
-# Uncommenting line below allows logging to be stored at same location where exe resides
+    # If something goes wrong, logging information might help.
+    # Uncommenting line below allows logging to be stored at same location where exe resides
     reroute_py2exe_logs()
     sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
 
-
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 from qtodotxt2 import app
 
 app.run()
-

examples/todo.txt

@@ -1,13 +1,6 @@
-(A) Make peace between Cylons and humans +PeaceProject
-(A) Review NCMR Log +Admin @work t:2017-12-22 rec:+1b due:2017-12-22
-(B) Report to <i>Admiral Adama</i> about FTL @CIC +GalacticaRepairs due:2013-05-24
-(C) 2016-12-08 Feed Schrodinger's Cat rec:+1d due:2014-02-23
-(C) Upgrade jump drives with Cylon technology +GalacticaRepairs
-2016-12-12 +GalacticaRepairs Check hull integrity rec:+7b due:2016-12-12
-Check for <b>DRADIS</b> contact @CIC
-Check if http://google.com is available
-Download code from <br/> https://github.com/QTodoTxt/QTodoTxt/archive/master.zip <br/>and give it a try!
-Find the question due:2017-06-10 rec:6d t:2017-06-09
-Think about <u>future</u> t:2099-12-31
-h:1 @CIC +GalacticaRepairs @work
-x 2016-02-21 (B) Seal ship's cracks with biomatter +GalacticaRepairs
+2020-05-05
+2020-05-05 (A) A thing @work @school +project due:2020-05-05
+2020-05-05 (B) due thing due:2020-05-05
+2020-05-05 (C) test text @test +project due:2020-05-16
+2020-05-05 more things due:2020-05-01
+x 2020-05-05 2020-05-05 finished due:2020-05-06

packaging/Debian/buildDebPackage.py

@@ -1,9 +1,9 @@
 import urllib.request
 import os
-import os.path 
+import os.path
 import sys
 import tarfile
-from shutil import copytree,ignore_patterns,copy,rmtree
+from shutil import copytree, ignore_patterns, copy, rmtree
 from stat import *
 import fnmatch
 import re
@@ -59,7 +59,7 @@ def buildPackageFolder(folderName):
 
     #Fix execution rights on bin folder
     for file in os.listdir(buildBinDir):
-        filePath=os.path.join(buildBinDir,file)
+        filePath=os.path.join(buildBinDir, file)
         if os.path.isfile(filePath):
             st = os.stat(filePath)
             os.chmod(filePath, st.st_mode | S_IEXEC)
@@ -85,7 +85,7 @@ def makeMd5sums(baseDir,outputFilePath):
 
     outputFile = open(outputFilePath, 'w')
 
-    for (root,dirs,files) in os.walk(baseDir):
+    for (root, dirs, files) in os.walk(baseDir):
         dirs[:] = [d for d in dirs if not re.match(excludes,d)]
         files = [f for f in files if not re.match(excludes,f)]
 
@@ -94,11 +94,10 @@ def makeMd5sums(baseDir,outputFilePath):
             md5 = hashlib.md5(open(path,'rb').read()).hexdigest()
             relativePath = root.replace(baseDir+'/',"",1) + os.sep + fn
             outputFile.write("%s %s\n" % (md5,relativePath))
-
     outputFile.close()
 
+
 def generateControl(templateFile,packageVersion,outputFilePath):
-
     templateExp = open(templateFile,'r').read()
     template = Template(templateExp)
 
@@ -128,6 +127,7 @@ def clean(fileName,folderName):
 
 # Call this with the version as first argument
 
+
 version=sys.argv[1]
 scriptDir = os.path.dirname(os.path.realpath(sys.argv[0]))
 # Step 1: download tag from github

packaging/MacOS/setup.py

@@ -32,6 +32,7 @@ def collect_packages(path, package_name, packages, excludes=None):
                 packages.append(subpackage_name)
                 collect_packages(subpath, subpackage_name, packages)
 
+
 packages = []
 collect_packages('.', '', packages, excludes=['test'])
 
@@ -58,4 +59,4 @@ def collect_packages(path, package_name, packages, excludes=None):
               "build_base": os.path.join(current_dir, 'build')
           },
       }
-    )
+      )

qtodotxt2/app.py

@@ -52,8 +52,8 @@ def setupAnotherInstanceEvent(controller):
         dirname = os.path.dirname(sys.argv[0])
         fileObserver = FileObserver()
         fileObserver.addPath(dirname)
-        #FIXME maybe do something in qml
-        #fileObserver.dirChangetSig.connect(controller.anotherInstanceEvent)
+        # FIXME maybe do something in qml
+        # fileObserver.dirChangetSig.connect(controller.anotherInstanceEvent)
 
 
 def setupSingleton(args):
@@ -79,7 +79,7 @@ def run():
     # Now set up our application and start
     app = QtWidgets.QApplication(sys.argv)
     # it is said, that this is lighter:
-    # (without qwidgets, as we probably don't need them anymore, when transition to qml is done)
+    # (without QWidgets, as we probably don't need them anymore, when transition to qml is done)
     # app = QtGui.QGuiApplication(sys.argv)
 
     name = QtCore.QLocale.system().name()
@@ -105,6 +105,9 @@ def run():
 
     controller.start()
     app.setWindowIcon(QtGui.QIcon(":/qtodotxt"))
+    # This line added to change the font and size if the default is too small.
+    # Working on a fontDialog so it can be changed that way.  2020-04-08
+
     app.exec_()
     sys.exit()
 

qtodotxt2/filters_controller.py

@@ -17,8 +17,6 @@ def __init__(self, parent, strings, flt=None, icon=None, order=None):
         self.setData(flt, QtCore.Qt.UserRole)
         self.filter = flt
         parent.appendRow([self])
-        #if order:
-        #self.setText(1, str(order))
         self.iconSource = icon
 
     def setCounts(self, total, completed):
@@ -101,9 +99,6 @@ def addDueRangeFilter(self, flt, counts, sortKey=0):
         item = FilterItem(parentItem, flt.text, flt=flt, icon=icon, order=sortKey)
         item.setCounts(*counts)
 
-        #parentItem.setExpanded(True)
-        #parentItem.sortChildren(1, QtCore.Qt.AscendingOrder)
-
     @QtCore.pyqtSlot(result='QVariantList')
     def getRootChildren(self):
         indexes = []
@@ -226,5 +221,3 @@ def filterTasks(filters, tasks):
                 filteredTasks.append(task)
                 break
     return filteredTasks
-
-

qtodotxt2/lib/file.py

@@ -3,14 +3,14 @@
 
 from PyQt5 import QtCore
 
-from qtodotxt2.lib.filters import DueTodayFilter, DueTomorrowFilter, DueThisWeekFilter, DueThisMonthFilter, DueOverdueFilter
+from qtodotxt2.lib.filters import DueTodayFilter, DueTomorrowFilter, DueThisWeekFilter, DueThisMonthFilter, \
+    DueOverdueFilter
 from qtodotxt2.lib.tasklib import Task
 
 logger = logging.getLogger(__name__)
 
 
 class File(QtCore.QObject):
-
     fileExternallyModified = QtCore.pyqtSignal()
     fileModified = QtCore.pyqtSignal(bool)
 
@@ -47,8 +47,6 @@ def _createTasksFromLines(self, lines):
 
     def _taskModified(self, task):
         self.setModified(True)
-        #if task not in self.tasks:
-            #self.tasks.append(task)
         if not task.text:
             self.deleteTask(task)
 
@@ -69,13 +67,12 @@ def connectTask(self, task):
         task.modified.connect(self._taskModified)
 
     def save(self, filename=''):
-#        logger.debug('File.save called with filename="%s"', filename)
         self._fileObserver.clear()
         if not filename and not self.filename:
             self.filename = self._createNewFilename()
         elif filename:
             self.filename = filename
-        self.tasks = sorted(self.tasks)  # we sort for users using simple text editors
+        self.tasks = sorted(self.tasks)
         self._saveTasks()
         self.modified = False
         self.fileModified.emit(False)
@@ -95,7 +92,6 @@ def _createNewFilename():
     def _saveTasks(self):
         with open(self.filename, 'wt', encoding='utf-8') as fd:
             fd.writelines([(task.text + self.newline) for task in self.tasks])
-#        logger.debug('%s was saved to disk.', self.filename)
 
     def saveDoneTask(self, task):
         doneFilename = os.path.join(os.path.dirname(self.filename), 'done.txt')
@@ -163,7 +159,6 @@ def getTasksCounters(self):
 
 
 class FileObserver(QtCore.QFileSystemWatcher):
-
     fileChangetSig = QtCore.pyqtSignal(str)
     dirChangetSig = QtCore.pyqtSignal(str)
 
@@ -184,5 +179,4 @@ def dirChangedHandler(self, path):
 
     def clear(self):
         if self.files():
-#            logger.debug('Clearing watchlist.')
             self.removePaths(self.files())

qtodotxt2/lib/task_htmlizer.py

@@ -48,9 +48,9 @@ def task2html(self, task):
             # add space, so tasks get evenly aligned when there's no priority
             html = '<tt>&nbsp;&nbsp;&nbsp;</tt>&nbsp;' + html
         if task.completion_date:
-            html += ' <font color="{1!s}">(completed: {0!s})</font>'.format(task.completion_date, self.complColor)
+            html += ' <font color="{1!s}">(completed:{0!s})</font>'.format(task.completion_date, self.complColor)
         if task.creation_date:
-            html += ' <font color="{1!s}">(created: {0!s})</font>'.format(task.creation_date, self.complColor)
+            html += ' <font color="{1!s}">(created:{0!s})</font>'.format(task.creation_date, self.complColor)
         return html
 
     def _addUrl(self, word, color="none"):