Switch qlview over to a full macOS app.

This stops building `qlview` as a command-line application and makes
it a normal app instead. As an app, it now supports a new URL scheme
`qlview:/path/to/file` that allows opening documents from the
command-line simply via `open`. The advantage of that approach is that
we no longer end up start up separate `qlview` instances for each
document being opened.

We also switch from distributing a ZIP file to a more standard DMG.

Author: rsmmr

.github/workflows/main.yml

@@ -3,17 +3,18 @@ name: CI pipeline
 on: push
 
 jobs:
-  adhoc:
-    runs-on: macos-14
+  build:
+    runs-on: macos-15
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Build code
-      run: make adhoc
+      run: make build
 
-  release:
-    runs-on: macos-14
+  dist:
+    if: github.ref == 'refs/heads/main'
+    runs-on: macos-15
     environment: release-macos
 
     steps:
@@ -52,13 +53,10 @@ jobs:
         xcrun notarytool store-credentials -k "${APP_STORE_KEY_PATH}" -d "${APP_STORE_KEY_ID}" -i "${APP_STORE_ISSUER_ID}" --keychain "${KEYCHAIN_PATH}" --no-validate "App Store Connect - Notarization API Key"
         rm "${APP_STORE_KEY_PATH}"
 
-    - name: Build code
-      run: make release
-
     - name: Build and notarize distribution
       run: |
         make dist
-        (cd build && echo "DIST=$(echo *.zip)" >>$GITHUB_ENV)
+        (cd build && echo "DIST=$(echo *.dmg)" >>$GITHUB_ENV)
 
     - uses: actions/upload-artifact@v4
       with:
@@ -71,13 +69,13 @@ jobs:
         security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
         rm -f $RUNNER_TEMP/key.p8
 
-  publish_release:
+  publish:
     permissions:
       contents: write
 
     runs-on: macos-14
     if: (startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-dev'))
-    needs: [release]
+    needs: [dist]
 
     steps:
       - name: Checkout code
@@ -107,4 +105,4 @@ jobs:
           name: ${{ env.release_name }}
           body_path: ${{ runner.temp }}/release-msg
           files: |
-            artifacts/*/*.zip
+            artifacts/*/*.dmg

.pre-commit-config.yaml

@@ -9,11 +9,21 @@ repos:
     entry: swift-format format -i
     language: system
     types: ["swift"]
-    stages: ["commit"]
+    stages: ["pre-commit"]
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.0.1
   hooks:
   - id: trailing-whitespace
+    exclude: '\.pxd$'
   - id: end-of-file-fixer
+    exclude: '\.pxd$'
   - id: check-added-large-files
+
+- repo: local
+  hooks:
+    - id: update-version
+      name: Update version number in Xcode project
+      entry: ./update-version
+      language: script
+      pass_filenames: false

.update-changes.cfg

@@ -2,20 +2,8 @@
 
 new_commit_msg="Update CHANGES."
 show_authors=0
-new_version_hook=replace_version_in_info_plist
 git_msg=git_msg_with_issue
 
-function replace_version_in_info_plist {
-    version=$1
-    /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${version}" qlview/Info.plist
-    git add -u qlview/Info.plist
-    git commit --amend --no-edit
-}
-
 function git_msg_with_issue {
     git show -s --pretty=format:%B $1 | gawk 'match($0, "([Ii]ssue|[Gg][Hh]|#)[ _-]?([0-9]+)", x) { issues[x[2]] = 1} { msg = msg $0 "\n"; } END { for ( i in issues ) printf("GH-%s: ", i); print msg; }'
 }
-
-function new_version_hook {
-    replace_version_in_info_plist $@
-}

Makefile

@@ -1,30 +1,43 @@
 
 VERSION=$(shell cat VERSION)
 NOTARIZATION_PROFILE="App Store Connect - Notarization API Key"
+CODESIGN_IDENTITY="Developer ID Application: Robin Sommer (4UJK727T59)"
 
-all: adhoc
+DMG="build/qlview-$(VERSION).dmg"
 
-adhoc:
-	xcodebuild -quiet -target qlview-adhoc -configuration Release
+all: build
 
-release:
-	xcodebuild -quiet -target qlview-signed -configuration Release
-	codesign --verify --verbose build/Release/qlview
+build:
+	xcodebuild -quiet -target qlview -configuration Release
 
-check:
-
-zip:
+dmg:
+	rm -f $(DMG)
 	rm -rf build/dist
 	mkdir -p build/dist
-	cp -R build/Release/qlview build/dist
-	cp -R mutt build/dist
-	cd build/dist && zip -r ../qlview-$(VERSION).zip *
-	ls build/*.zip | sed 's/^/> /'
+	cp -a build/Release/qlview.app build/dist
+	cp -a mutt build/dist
+	cp -a resources/DS_Store build/dist/.DS_Store
+	ln -s /Applications/ build/dist/Applications
+	codesign -f --timestamp -o runtime -s $(CODESIGN_IDENTITY) build/dist/qlview.app
+	hdiutil create -volname "qlview $(VERSION)" -srcFolder build/dist -o $(DMG)
+	codesign --timestamp -s $(CODESIGN_IDENTITY) $(DMG)
+	codesign --verify --verbose $(DMG)
 
 notarize:
-	xcrun notarytool submit --keychain-profile $(NOTARIZATION_PROFILE) --wait --timeout 10m build/qlview-$(VERSION).zip
+	xcrun notarytool submit --keychain-profile $(NOTARIZATION_PROFILE) --wait --timeout 10m $(DMG)
+	xcrun stapler staple $(DMG)
 
-dist: zip notarize
+check:
+	@echo
+	syspolicy_check distribution $(DMG)
+
+dist: build dmg notarize check
+	@echo
+	ls build/*.dmg | sed 's/^/> /'
 
 clean:
 	rm -rf build
+
+icons:
+	# github.com:abeintopalo/AppIconSetGen.git
+	appiconsetgen resources/icon.png --output qlview/Assets.xcassets --macOS

README.md

@@ -2,48 +2,45 @@
 
 This is a standalone document previewer based on macOS's built-in
 Quick Look engine——imagine a nicer `qlmanage`. It's particularly
-useful as a quick command-line viewer for terminal applications, like
-[mutt](http://www.mutt.org).
+useful for using from the command line or inside terminal
+applications, like [mutt](http://www.mutt.org).
 
 ![Screenshot](screenshot.png "Screenshot")
 
 ## Installation
 
 You can either download a [pre-built
 release](https://github.com/rsmmr/qlview/releases), or build it
-yourself. Either way, you then probably want to copy the executable
-into your `PATH`.
+yourself.
 
-When getting the current release, you'll find the executable inside
-the ZIP file you downloaded. While it's codesigned and notarized,
-please note that you still cannot just double-click to run it, as it
-is not an app but a command line application.
+When getting the current release, install it like any other
+application: open the disk image and drag the app to your
+`Applications` folder.
 
 When building it yourself, make sure you have Xcode installed. Either
 use that to open and build the project, or just run `make` from the
-command line. You will then find the executable in
-`build/Release/qlview`.
+command line. You will then find the application in
+`build/Release/qlview.app`.
 
 ## Usage
 
-Run it from the command line:
+You can start `qlview` from the Finder, and it'll open an empty window
+where you can drag a document into. More usefully, you can open
+documents from the command line through a custom URL scheme:
 
 ```
-# qlview <file>
+# open qlview:/path/to/file
 ```
 
-If you execute `qlview` without any arguments, it'll open an empty
-window where you can drag a document into.
-
 ## Mutt integration
 
 To use `qlview` with [mutt](http://www.mutt.org), there's a helper
 script
 [mutt-qlview](https://github.com/rsmmr/qlview/blob/main/mutt/mutt-qlview)
-coming with the distribution. Put both that script and `qlview` itself
-into your `PATH` and then add [these mailcap
+coming with the distribution. Put that script into your `PATH` and
+then add [these mailcap
 entries](https://github.com/rsmmr/qlview/blob/main/mutt/mailcap) to
-your mutt configuration; see [mutt's
+your mutt configuration. See [mutt's
 manual](http://www.mutt.org/doc/manual/#mailcap) for more on that.
 
 You can also add the following to your `.muttrc` to quickly open the

VERSION

@@ -1 +1 @@
-0.4
+0.5

mutt/mutt-qlview

@@ -20,9 +20,6 @@ error() {
 qlview="$(cd "$(dirname "$0")" && pwd)/qlview"
 test -f "${qlview}" -a -x "${qlview}" || qlview="$(command -v qlview 2>/dev/null)"
 
-test -n "${qlview}" || error "qlview not found"
-(test $# -eq 1 || test $# -eq 2) || usage
-
 file="$1"
 test -f "${file}" || error "no file '${file}'"
 
@@ -40,4 +37,4 @@ else
     cp -f "${file}" "${tmpfile}"
 fi
 
-nohup "${qlview}" "${tmpfile}" >/dev/null 2>&1 </dev/null &
+open qlview:${tmpfile}