From 6db2fa2be665742f5a4a32bdc149e272c563cafb Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Mon, 9 Jan 2023 22:35:12 -0600 Subject: [PATCH] fix: Correct flake8 config - Add exclude pattern for flake8 when running with pre-commit as it does not fully honor the exclude paths. - Cleanup exclude paths for flake8 in tox.ini - Re-enable line length check and correct three affected files --- .pre-commit-config.yaml | 1 + core/fs.py | 9 ++++++--- qt/exclude_list_dialog.py | 4 ++-- qt/preferences_dialog.py | 6 ++++-- tox.ini | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9633bb1c..364a9285 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,7 @@ repos: rev: 6.0.0 hooks: - id: flake8 + exclude: ^(.tox|env|build|dist|help|qt/dg_rc.py|pkg).* - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook rev: v9.3.0 hooks: diff --git a/core/fs.py b/core/fs.py index 647a5cfd..6b3c2864 100644 --- a/core/fs.py +++ b/core/fs.py @@ -97,12 +97,14 @@ class FilesDB: schema_version = 1 schema_version_description = "Changed from md5 to xxhash if available." - create_table_query = "CREATE TABLE IF NOT EXISTS files (path TEXT PRIMARY KEY, size INTEGER, mtime_ns INTEGER, entry_dt DATETIME, digest BLOB, digest_partial BLOB, digest_samples BLOB)" + create_table_query = """CREATE TABLE IF NOT EXISTS files (path TEXT PRIMARY KEY, size INTEGER, mtime_ns INTEGER, + entry_dt DATETIME, digest BLOB, digest_partial BLOB, digest_samples BLOB)""" drop_table_query = "DROP TABLE IF EXISTS files;" select_query = "SELECT {key} FROM files WHERE path=:path AND size=:size and mtime_ns=:mtime_ns" select_query_ignore_mtime = "SELECT {key} FROM files WHERE path=:path AND size=:size" insert_query = """ - INSERT INTO files (path, size, mtime_ns, entry_dt, {key}) VALUES (:path, :size, :mtime_ns, datetime('now'), :value) + INSERT INTO files (path, size, mtime_ns, entry_dt, {key}) + VALUES (:path, :size, :mtime_ns, datetime('now'), :value) ON CONFLICT(path) DO UPDATE SET size=:size, mtime_ns=:mtime_ns, entry_dt=datetime('now'), {key}=:value; """ @@ -153,7 +155,8 @@ class FilesDB: self.cur.execute(self.select_query_ignore_mtime.format(key=key), {"path": str(path), "size": size}) else: self.cur.execute( - self.select_query.format(key=key), {"path": str(path), "size": size, "mtime_ns": mtime_ns} + self.select_query.format(key=key), + {"path": str(path), "size": size, "mtime_ns": mtime_ns}, ) result = self.cur.fetchone() diff --git a/qt/exclude_list_dialog.py b/qt/exclude_list_dialog.py index 7b5c9c64..43747b5d 100644 --- a/qt/exclude_list_dialog.py +++ b/qt/exclude_list_dialog.py @@ -165,8 +165,8 @@ Directores will also have their default state set to Excluded \ in the Directories tab if their name happens to match one of the selected regular expressions.
\ For each file collected, two tests are performed to determine whether or not to completely ignore it:
\
  • 1. Regular expressions with no path separator in them will be compared to the file name only.
    • -
  • 2. Regular expressions with at least one path separator in them will be compared to the full path to the file.

    • -Example: if you want to filter out .PNG files from the "My Pictures" directory only:
    \ +
  • 2. Regular expressions with at least one path separator in them will be compared to the full path to the file.
    • \ +
    Example: if you want to filter out .PNG files from the "My Pictures" directory only:
    \ .*My\\sPictures\\\\.*\\.png

    \ You can test the regular expression with the "test string" button after pasting a fake path in the test field:
    \ C:\\\\User\\My Pictures\\test.png

    diff --git a/qt/preferences_dialog.py b/qt/preferences_dialog.py index 0182a4ec..216d3f7e 100644 --- a/qt/preferences_dialog.py +++ b/qt/preferences_dialog.py @@ -146,7 +146,8 @@ On MacOS, the tab bar will fill up the window's width instead." ) self.use_native_dialogs.setToolTip( tr( - "For actions such as file/folder selection use the OS native dialogs.\nSome native dialogs have limited functionality." + "For actions such as file/folder selection use the OS native dialogs.\n\ +Some native dialogs have limited functionality." ) ) layout.addWidget(self.use_native_dialogs) @@ -217,7 +218,8 @@ use the modifier key to drag the floating window around" def _setup_advanced_page(self): tab_label = QLabel( tr( - "These options are for advanced users or for very specific situations, most users should not have to modify these." + "These options are for advanced users or for very specific situations, \ +most users should not have to modify these." ), wordWrap=True, ) diff --git a/tox.ini b/tox.ini index 8596e66c..a9f8b827 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps = -r{toxinidir}/requirements-extra.txt [flake8] -exclude = .tox,env,build,cocoalib,cocoa,help,./qt/dg_rc.py,cocoa/run_template.py,./pkg +exclude = .tox,env*,build,help,qt/dg_rc.py,pkg max-line-length = 120 select = C,E,F,W,B,B950 -extend-ignore = E203, E501, W503 +extend-ignore = E203,W503