Rewrite QuickLook plugin based on QLPreviewProvider (#1087)

IB-7359

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/workflows/build.yml

@@ -56,7 +56,7 @@ jobs:
     container: ubuntu:${{ matrix.container }}
     strategy:
       matrix:
-        container: ['22.04', '24.04', '24.10', '25.04']
+        container: ['22.04', '24.04', '25.04']
         arch: ['amd64', 'arm64']
     env:
       DEBIAN_FRONTEND: noninteractive
@@ -130,12 +130,10 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        vcver: [143, 142]
+        vcver: [143]
         include:
         - vcver: 143
           image: windows-2022
-        - vcver: 142
-          image: windows-2019
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
@@ -159,7 +157,7 @@ jobs:
       uses: lukka/run-vcpkg@v7
       with:
         vcpkgArguments: openssl zlib flatbuffers
-        vcpkgGitCommitId: e4644bd15436d406bba71928d086c809e5c9ca45
+        vcpkgGitCommitId: 4008642a50a01a7115c2406b04d5273898e7fe1c
         vcpkgTriplet: x64-windows
     - name: Install Qt
       uses: jurplel/install-qt-action@v4

client/Application.cpp

@@ -147,7 +147,9 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 
 #ifdef Q_OS_MAC
 	std::string TSLCache() const final
-	{ return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation).toStdString(); }
+	{
+		return Application::groupContainerPath().toStdString();
+	}
 #endif
 
 	std::vector<digidoc::X509Cert> TSCerts() const final

client/Application.h

@@ -75,6 +75,9 @@ class Application final: public BaseApplication
 	static uint readTSLVersion(const QString &path);
 	static void showClient(const QStringList &params = {}, bool crypto = false, bool sign = false, bool newWindow = false);
 	static void updateTSLCache(const QDateTime &tslTime);
+#if defined(Q_OS_MAC)
+	static QString groupContainerPath();
+#endif
 
 private Q_SLOTS:
 	static void browse(const QUrl &url);

client/Application_mac.mm

@@ -25,6 +25,8 @@
 #include <QtCore/QUrlQuery>
 #include <QtGui/QDesktopServices>
 
+using namespace Qt::StringLiterals;
+
 @implementation NSApplication (ApplicationObjC)
 
 - (void)appReopen:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
@@ -96,7 +98,7 @@ - (void)openCrypto:(NSPasteboard *)pboard userData:(NSString *)data error:(NSStr
 void Application::mailTo( const QUrl &url )
 {
 	QUrlQuery q(url);
-	if(NSURL *appUrl = CFBridgingRelease(LSCopyDefaultApplicationURLForURL((__bridge CFURLRef)url.toNSURL(), kLSRolesAll, nil)))
+	if(NSURL *appUrl = [NSWorkspace.sharedWorkspace URLForApplicationToOpenURL:url.toNSURL()])
 	{
 		QString p;
 		QTextStream s( &p );
@@ -112,24 +114,11 @@ - (void)openCrypto:(NSPasteboard *)pboard userData:(NSString *)data error:(NSStr
 			<< "end tell" << Qt::endl
 			<< "end run" << Qt::endl;
 		}
-		else if([appUrl.path rangeOfString:@"Entourage"].location != NSNotFound)
-		{
-			s << "on run" << Qt::endl
-			<< "set vattachment to \"" << q.queryItemValue(QStringLiteral("attachment")) << "\"" << Qt::endl
-			<< "set vsubject to \"" << q.queryItemValue(QStringLiteral("subject")) << "\"" << Qt::endl
-			<< "tell application \"Microsoft Entourage\"" << Qt::endl
-			<< "set vmessage to make new outgoing message with properties" << Qt::endl
-			<< "{subject:vsubject, attachments:vattachment}" << Qt::endl
-			<< "open vmessage" << Qt::endl
-			<< "activate" << Qt::endl
-			<< "end tell" << Qt::endl
-			<< "end run" << Qt::endl;
-		}
 		else if([appUrl.path rangeOfString:@"Outlook"].location != NSNotFound)
 		{
 			s << "on run" << Qt::endl
-			<< "set vattachment to \"" << q.queryItemValue(QStringLiteral("attachment")) << "\" as POSIX file" << Qt::endl
-			<< "set vsubject to \"" << q.queryItemValue(QStringLiteral("subject")) << "\"" << Qt::endl
+			<< "set vattachment to \"" << q.queryItemValue(u"attachment"_s) << "\" as POSIX file" << Qt::endl
+			<< "set vsubject to \"" << q.queryItemValue(u"subject"_s) << "\"" << Qt::endl
 			<< "tell application \"Microsoft Outlook\"" << Qt::endl
 			<< "activate" << Qt::endl
 			<< "set vmessage to make new outgoing message with properties {subject:vsubject}" << Qt::endl
@@ -153,3 +142,10 @@ - (void)openCrypto:(NSPasteboard *)pboard userData:(NSString *)data error:(NSStr
 	}
 	QDesktopServices::openUrl( url );
 }
+
+QString Application::groupContainerPath()
+{
+	return QString::fromNSString([NSFileManager.defaultManager
+		containerURLForSecurityApplicationGroupIdentifier:@"group.ee.ria.qdigidoc4.tsl"].path);
+}
+

client/CMakeLists.txt

@@ -175,8 +175,8 @@ if( APPLE )
 	find_library(PKCS11_MODULE NAMES opensc-pkcs11.so HINTS /Library/OpenSC/lib)
 	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 		COMMAND cp -a ${PKCS11_MODULE} $<TARGET_FILE_DIR:${PROJECT_NAME}>
-		COMMAND mkdir -p $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Library/QuickLook
-		COMMAND cp -a $<TARGET_BUNDLE_DIR:DigiDocQL> $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Library/QuickLook
+		COMMAND mkdir -p $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns
+		COMMAND cp -a $<TARGET_BUNDLE_DIR:DigiDocQL> $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns
 	)
 	add_custom_target(macdeployqt DEPENDS ${PROJECT_NAME}
 		COMMAND ${qtCore_install_prefix}/macdeployqt $<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
@@ -196,11 +196,12 @@ if( APPLE )
 			$<TARGET_FILE_DIR:${PROJECT_NAME}>/*.*
 			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/digidocpp.framework/Libraries/*
 			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/*.framework
-			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/*/*
-			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Library/QuickLook/DigiDocQL.qlgenerator
+			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/*/*.dylib
 		COMMAND if echo \"$$SIGNCERT\" | grep -q "Developer ID" \; then
+				codesign -f --options runtime -s \"$$SIGNCERT\" $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex --entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements\;
 				codesign -f --options runtime -s \"$$SIGNCERT\" $<TARGET_BUNDLE_DIR:${PROJECT_NAME}> --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.eToken.entitlements\;
 			else
+				codesign -f -s \"$$SIGNCERT\" $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex --entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements\;
 				codesign -f -s \"$$SIGNCERT\" $<TARGET_BUNDLE_DIR:${PROJECT_NAME}> --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.entitlements\;
 			fi
 	)

extensions/DigiDocQL/CMakeLists.txt

@@ -1,24 +1,26 @@
-set( RESOURCES ../../client/mac/Resources/asic.icns )
-add_library( DigiDocQL MODULE
-	${RESOURCES}
-	Info.plist
-	main.c
-	GenerateThumbnailForURL.c
-	GeneratePreviewForURL.mm
+set(RESOURCES ../../client/mac/Resources/asic.icns)
+add_executable(DigiDocQL MACOSX_BUNDLE
+    ${RESOURCES}
+    PreviewViewController.mm
 )
-set_source_files_properties( GeneratePreviewForURL.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" )
-set_source_files_properties( Info.plist PROPERTIES MACOSX_PACKAGE_LOCATION . )
-set_target_properties( DigiDocQL PROPERTIES
-	BUNDLE YES
-	BUNDLE_EXTENSION qlgenerator
-	RESOURCE "${RESOURCES}"
-	XCODE_ATTRIBUTE_WRAPPER_EXTENSION qlgenerator
-	MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
-	AUTOMOC OFF
-	COMPILE_FLAGS "-Wno-unused-parameter"
-	LINK_LIBRARIES "-framework QuickLook;-framework Cocoa"
-	LINK_FLAGS "-F/Library/Frameworks -fobjc-arc"
-	BUILD_WITH_INSTALL_RPATH YES
-	INSTALL_RPATH "@loader_path/../../../../../Frameworks"
+set_target_properties(DigiDocQL PROPERTIES
+    BUNDLE YES
+    BUNDLE_EXTENSION appex
+    RESOURCE ${RESOURCES}
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.cmake
+    MACOSX_BUNDLE_BUNDLE_NAME DigiDocQL
+    MACOSX_BUNDLE_GUI_IDENTIFIER "ee.ria.qdigidoc4.DigiDocQL"
+    MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2025 Estonian Information System Authority"
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
+    MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_NUMBER}
+    AUTOMOC OFF
+    COMPILE_FLAGS "-Wno-unused-parameter -fobjc-arc"
+    LINK_LIBRARIES "-framework QuickLookUI;-framework UniformTypeIdentifiers"
+    LINK_FLAGS "-F/Library/Frameworks -fobjc-arc -e _NSExtensionMain -fapplication-extension"
+    BUILD_WITH_INSTALL_RPATH YES
+    INSTALL_RPATH "@loader_path/../../../../Frameworks"
+    XCODE_ATTRIBUTE_WRAPPER_EXTENSION appex
+    XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
+    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "ee.ria.qdigidoc4.DigiDocQL"
 )
 target_link_libraries(DigiDocQL digidocpp::digidocpp)

extensions/DigiDocQL/DigiDocQL.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.application-identifier</key>
+	<string>ET847QJV9F.ee.ria.qdigidoc4.DigiDocQL</string>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.ee.ria.qdigidoc4.tsl</string>
+	</array>
+</dict>
+</plist>