[dist] Fix hang on Windows due to not creating console window #209

Author: Breakthrough

README.md

@@ -4,7 +4,7 @@
 
 ------------------------------------------------
 
-### Latest Release: v1.7 (February 28, 2025)
+### Latest Release: v1.7.0.1 (March 11, 2025)
 
 **Website**: [dvr-scan.com](https://www.dvr-scan.com)
 
@@ -62,5 +62,5 @@ See [the documentation](https://www.dvr-scan.com/docs) for a complete list of al
 
 ------------------------------------------------
 
-Copyright © 2016-2024 Brandon Castellano. All rights reserved.
+Copyright © 2016-2025 Brandon Castellano. All rights reserved.
 Licensed under BSD 2-Clause (see the LICENSE file for details).

appveyor.yml

@@ -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.4\\bin\\x86'
+  - 'SET PATH=%PATH%;C:\\Program Files (x86)\\Caphyon\\Advanced Installer 22.5\\bin\\x86'
   # License path must be absolute
   - AdvancedInstaller.com /RegisterOffline "%cd%\license65.dat"
   # Create MSI installer

dist/dvr-scan.spec

@@ -58,7 +58,8 @@ app_exe = EXE(app_pyz,
           debug=False,
           strip=False,
           upx=True,
-          console=False,
+          console=True,
+          hide_console="hide-late",
           version='.version_info',
           icon='../dvr_scan/dvr-scan.ico')
 

dist/installer/DVR-Scan.aip

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="13.5" version="22.3" Modules="professional" RootPath="." Language="en" Id="{3919FEC9-E2C3-453E-81FD-9E8BABBE2CA4}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="13.5" version="22.5" Modules="professional" RootPath="." Language="en" Id="{3919FEC9-E2C3-453E-81FD-9E8BABBE2CA4}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_APP_FILE" Value="[#dvrscanapp.exe]"/>
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
@@ -22,10 +22,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="DialogBitmap" Value="dialog.jpg" MultiBuildValue="DefaultBuild:installer_logo.jpg" Type="1" MsiKey="DialogBitmap"/>
     <ROW Property="Manufacturer" Value="Brandon Castellano"/>
-    <ROW Property="ProductCode" Value="1033:{69127555-50F1-4890-AA09-BD3A9D3DD948} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{C592C702-695E-4B72-8E59-09BFE5F32582} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="DVR-Scan"/>
-    <ROW Property="ProductVersion" Value="1.7" Options="32"/>
+    <ROW Property="ProductVersion" Value="1.7.0.1" Options="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{8FEF5940-4574-4C5D-9776-2CDDC0375510}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -105,7 +105,7 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="ACT" ComponentId="{D95A9999-B504-484E-A1D8-14BF76FBD948}" Directory_="Australia_Dir" Attributes="0" KeyPath="ACT" Type="0"/>
-    <ROW Component="AI_CustomARPName" ComponentId="{612322CC-E55B-4730-BCEA-5DFDAE742FE9}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{A2ED4D2C-D97E-4BA6-81FE-02725FE0A0C4}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
     <ROW Component="AI_DisableModify" ComponentId="{653C9260-5E39-41EA-9C74-362F9C299BED}" Directory_="APPDIR" Attributes="260" KeyPath="NoModify" Options="1"/>
     <ROW Component="AI_SHORTCUTSREG" ComponentId="{271A6EBA-4BA8-47EE-B3BA-34DC4C1A6531}" Directory_="APPDIR" Attributes="260" KeyPath="AI_SHORTCUTSREG" Options="1"/>
     <ROW Component="APPDIR" ComponentId="{088A429B-96BF-40BE-9BA2-B2CA5EB76862}" Directory_="APPDIR" Attributes="0"/>

dist/pre_release.py

@@ -27,10 +27,11 @@ def write_version_info_for_windows_exe():
 
     with open("dist/.version_info", "wb") as f:
         elements = [int(elem) if elem.isnumeric() else 999 for elem in VERSION.split(".")]
-        assert 2 <= len(elements) <= 3
-        major = elements[0]
-        minor = elements[1]
-        patch = elements[2] if len(elements) == 3 else 0
+        assert len(elements) <= 4
+        elements.extend([0] * (4 - len(elements)))
+
+        assert len(elements) == 4
+        (major, minor, patch, build) = elements
 
         f.write(
             f"""# UTF-8
@@ -41,8 +42,8 @@ def write_version_info_for_windows_exe():
   ffi=FixedFileInfo(
 # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
 # Set not needed items to zero 0.
-filevers=(0, {major}, {minor}, {patch}),
-prodvers=(0, {major}, {minor}, {patch}),
+filevers=({major}, {minor}, {patch}, {build}),
+prodvers=({major}, {minor}, {patch}, {build}),
 # Contains a bitmask that specifies the valid bits 'flags'r
 mask=0x3f,
 # Contains a bitmask that specifies the Boolean attributes of the file.

docs/changelog.md

@@ -3,7 +3,11 @@
 
 ----------------------------------------------------------
 
-## DVR-Scan 1.7
+#### Changelog
+
+### 1.7.0.1 (March 11, 2025)
+
+Re-release of Windows distribution that fixes program hanging when starting scan ([#209](https://github.com/Breakthrough/DVR-Scan/issues/209)). This was caused due to the way the program was built. There are no code changes, so the Python distribution has not been re-released.
 
 ### 1.7 (February 28, 2025)
 

docs/download.md

@@ -29,9 +29,9 @@ Linux users may need to install the `python3-tk` package (e.g. `sudo apt install
 
 ## Windows<span class="dvr-scan-download-icons">:fontawesome-brands-windows:</span>
 
-!!! windows-download "**1.7**<span class="dvr-scan-release-date">February 28, 2025</span>"
+!!! windows-download "**1.7.0.1**<span class="dvr-scan-release-date">March 11, 2025</span>"
 
-    <div class="buttongrid buttongrid-download">[:fontawesome-solid-download: &nbsp; Installer `.msi`](https://github.com/Breakthrough/DVR-Scan/releases/download/v1.7-release/dvr-scan-1.7-win64.msi){ .md-button #download-button }[:fontawesome-solid-file-zipper: &nbsp; Portable `.zip`](https://github.com/Breakthrough/DVR-Scan/releases/download/v1.7-release/dvr-scan-1.7-win64.zip){ .md-button #changelog-button }</div>
+    <div class="buttongrid buttongrid-download">[:fontawesome-solid-download: &nbsp; Installer `.msi`](https://github.com/Breakthrough/DVR-Scan/releases/download/v1.7-release/dvr-scan-1.7.0.1-win64.msi){ .md-button #download-button }[:fontawesome-solid-file-zipper: &nbsp; Portable `.zip`](https://github.com/Breakthrough/DVR-Scan/releases/download/v1.7-release/dvr-scan-1.7.0.1-win64.zip){ .md-button #changelog-button }</div>
 
 
 The installer is recommended for most users.  Windows builds include all required dependencies to run DVR-Scan.  Only 64-bit builds are available.

docs/index.md

@@ -11,7 +11,7 @@ hide:
 
 ------------------------------------------------------
 
-!!! success "Latest Version: 1.7 (February 28, 2025)"
+!!! success "Latest Version: 1.7.0.1 (March 11, 2025)"
 
     <div class="buttongrid">[:fontawesome-solid-download: &nbsp; Download](download.md){ .md-button #download-button }[:fontawesome-solid-book: User Guide](guide.md){ .md-button #changelog-button }[:fontawesome-solid-bars: &nbsp; Documentation](docs.md){ .md-button #documentation-button }[:fontawesome-solid-gear: &nbsp; Resources](resources.md){ .md-button #quickstart-button }</div>
 

dvr_scan/__init__.py

@@ -35,7 +35,7 @@
 import sys
 
 # Used for module/distribution identification.
-__version__ = "1.7"
+__version__ = "1.7.0.1"
 
 # Handle loading OpenCV. This **MUST** be first before any other DVR-Scan or third-party
 # packages are imported which might attempt to import the `cv2` module.