Merge branch 'releases/1.7'

Author: Breakthrough

.gitignore

@@ -2,6 +2,7 @@
 *.pyc
 *.pyo
 *.egg-info/
+__pycache__/
 
 # Location of built documentation
 site/

README.md

@@ -4,15 +4,7 @@
 
 ------------------------------------------------
 
-### Beta Release: v1.7-dev1 (February 2, 2025)
-
-The latest beta of DVR-Scan includes a new GUI.  See [the release page](https://github.com/Breakthrough/DVR-Scan/releases/tag/v1.7-dev1) for download links and screenshots.  Feedback is most welcome (see issue [#198](https://github.com/Breakthrough/DVR-Scan/issues/198)).
-
-![GUI Beta Screenshot](https://github.com/user-attachments/assets/6d6bb509-f40c-48ba-95d9-a7912935e9eb)
-
-------------------------------------------------
-
-### Latest Release: v1.6.2 (December 17, 2024)
+### Latest Release: v1.7 (February 28, 2025)
 
 **Website**: [dvr-scan.com](https://www.dvr-scan.com)
 
@@ -30,9 +22,17 @@ DVR-Scan is a command-line application that **automatically detects motion event
 
     pip install dvr-scan[opencv] --upgrade
 
-Windows builds are also available on [the Downloads page](https://www.dvr-scan.com/download/).
+Windows builds (installer + portable) are also available on [the Downloads page](https://www.dvr-scan.com/download/).
+
+## Quickstart (UI)
+
+Start DVR-Scan (run `dvr-scan-app` or click the app shortcut), **Add** your input videos, and hit **Start**:
+
+<img alt="main app window" src="https://raw.githubusercontent.com/Breakthrough/DVR-Scan/releases/1.7/docs/assets/app-main-window.jpg" width="480"/>
+
+See the [User Guide](https://www.dvr-scan.com/guide/) for a more comprehensive overview.
 
-## Quickstart
+## Quickstart (CLI)
 
 Scan `video.mp4` (separate clips for each event):
 
@@ -42,7 +42,7 @@ Select a region to scan using [the region editor](https://www.dvr-scan.com/guide
 
     dvr-scan -i video.mp4 -r
 
-<img alt="example of region editor" src="https://raw.githubusercontent.com/Breakthrough/DVR-Scan/releases/1.6/docs/assets/region-editor-mask.jpg" width="480"/>
+<img alt="example of region editor" src="https://raw.githubusercontent.com/Breakthrough/DVR-Scan/releases/1.7/docs/assets/region-editor-mask.jpg" width="480"/>
 
 Select a region to scan using command line (list of points as X Y):
 
@@ -52,7 +52,7 @@ Draw boxes around motion:
 
     dvr-scan -i video.mp4 -bb
 
-<img alt="example of bounding boxes" src="https://raw.githubusercontent.com/Breakthrough/DVR-Scan/releases/1.6/docs/assets/bounding-box.gif" width="480"/>
+<img alt="example of bounding boxes" src="https://raw.githubusercontent.com/Breakthrough/DVR-Scan/releases/1.7/docs/assets/bounding-box.gif" width="480"/>
 
 Use `ffmpeg` to extract events:
 

appveyor.yml

@@ -27,8 +27,8 @@ deploy:
   url: https://app.signpath.io/API/v1/f2efa44c-5b5c-45f2-b44f-8f9dde708313/Integrations/AppVeyor?ProjectSlug=DVR-Scan&SigningPolicySlug=release-signing
   authorization:
     secure: FBgWCaxCCKOqc2spYf5NGWSNUGLbT5WeuC5U0k4Of1Ids9n51YWxhGlMyzLbdNBFe64RUcOSzk/N3emlQzbsJg==
-  on:
-    APPVEYOR_REPO_TAG: true # keep casing this way for Linux builds where variables are case-sensitive
+#  on:
+#    APPVEYOR_REPO_TAG: true # keep casing this way for Linux builds where variables are case-sensitive
 
 install:
   - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -66,7 +66,7 @@ install:
   - appveyor DownloadFile https://www.advancedinstaller.com/downloads/advinst.msi
   - msiexec /i advinst.msi /qn
   # TODO: Determine the path to Advanced Installer more programatically.
-  - 'SET PATH=%PATH%;C:\\Program Files (x86)\\Caphyon\\Advanced Installer 22.3\\bin\\x86'
+  - 'SET PATH=%PATH%;C:\\Program Files (x86)\\Caphyon\\Advanced Installer 22.4\\bin\\x86'
   # License path must be absolute
   - AdvancedInstaller.com /RegisterOffline "%cd%\license65.dat"
   # Create MSI installer
@@ -80,7 +80,8 @@ install:
   - cd dist
   - move installer\DVR-Scan-*.msi .
   - cp dvr-scan\dvr-scan.exe .
-  - 7z a dvr-scan-signed.zip dvr-scan.exe DVR-Scan-*.msi
+  - cp dvr-scan\dvr-scan-app.exe .
+  - 7z a dvr-scan-signed.zip dvr-scan.exe dvr-scan-app.exe DVR-Scan-*.msi
   - cd ..
 
 test_script:
@@ -93,6 +94,7 @@ test_script:
   - cd dist/dvr-scan
   - dvr-scan.exe --version
   - dvr-scan.exe -i ../../tests/resources/simple_movement.mp4 -so -df 4 -et 100
+  - dvr-scan-app.exe --version
 
 artifacts:
   # Portable ZIP

dist/dvr-scan.spec

@@ -32,10 +32,45 @@ cli_exe = EXE(cli_pyz,
           version='.version_info',
           icon='../dvr_scan/dvr-scan.ico')
 
-coll = COLLECT(cli_exe,
+app = Analysis(['../dvr_scan/app/__main__.py'],
+             pathex=['.'],
+             binaries=None,
+             datas=[
+                ('../dvr_scan/dvr-scan.ico', 'dvr_scan'),
+                ('../dvr_scan/dvr-scan-logo.png', 'dvr_scan'),
+                ('../dvr_scan/LICENSE*', 'dvr_scan'),
+            ],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=["av"],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+
+app_pyz = PYZ(app.pure, app.zipped_data,
+             cipher=block_cipher)
+
+app_exe = EXE(app_pyz,
+          app.scripts,
+          exclude_binaries=True,
+          name='dvr-scan-app',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=False,
+          version='.version_info',
+          icon='../dvr_scan/dvr-scan.ico')
+
+coll = COLLECT(
+               cli_exe,
                cli.binaries,
                cli.zipfiles,
                cli.datas,
+               app_exe,
+               app.binaries,
+               app.zipfiles,
+               app.datas,
                strip=False,
                upx=True,
                name='dvr-scan')