Apps: Added Mime-types and icons for eCAL Play, eCAL Sys and eCAL Rec files

emilbic28 · FlorianReimold · commit ee29fe7881d9 · 2022-07-27T14:40:35.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -474,6 +474,13 @@ if(BUILD_DOCS)
   add_subdirectory(doc)
 endif()
 
+# --------------------------------------------------------
+# debscripts
+# --------------------------------------------------------
+if (UNIX)
+  add_subdirectory(cpack/debscripts)
+endif()
+
 #install(EXPORT eCALTargets DESTINATION cmake NAMESPACE eCAL::)
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
diff --git a/app/play/play_gui/CMakeLists.txt b/app/play/play_gui/CMakeLists.txt
@@ -221,3 +221,12 @@ install(CODE
     "
 )
 endif()
+
+# install files required for linux mimetypes and icon
+if (UNIX)
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/ecal-play.xml"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages/")
+
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/application-ecalmeas.svg"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes/")
+endif()
diff --git a/app/play/play_gui/appmenu/app.desktop.in b/app/play/play_gui/appmenu/app.desktop.in
@@ -6,4 +6,5 @@ Exec=@CMAKE_INSTALL_PREFIX@/@eCAL_install_app_dir@/ecal_@TARGET_NAME@ %f
 Terminal=false
 Type=Application
 Icon=ecal_@TARGET_NAME@
+MimeType=application/ecalmeas
 Categories=Development;
diff --git a/app/play/play_gui/mimetype/application-ecalmeas.svg b/app/play/play_gui/mimetype/application-ecalmeas.svg
diff --git a/app/play/play_gui/mimetype/ecal-play.xml b/app/play/play_gui/mimetype/ecal-play.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/ecalmeas">
+    <comment>Textfile with ecalmeas markup</comment>
+    <glob pattern="*.ecalmeas"/>
+  </mime-type>
+</mime-info>
diff --git a/app/rec/rec_client_core/src/job/record_job.cpp b/app/rec/rec_client_core/src/job/record_job.cpp
@@ -255,6 +255,8 @@ namespace eCAL
 
         if (ecalmeas_file.is_open())
         {
+          // For mimetypes to work, ecalmeas file should not be empty
+          ecalmeas_file << std::string(" ");
           ecalmeas_file.close();
           files_with_metadata_.push_back(ecalmeas_file_name);
         }
diff --git a/app/rec/rec_gui/CMakeLists.txt b/app/rec/rec_gui/CMakeLists.txt
@@ -257,3 +257,12 @@ install(CODE
     "
 )
 endif()
+
+# install files required for linux mimetypes and icon
+if (UNIX)
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/ecal-rec.xml"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages/")
+
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/application-ecalrec.svg"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes/")
+endif()
diff --git a/app/rec/rec_gui/appmenu/app.desktop.in b/app/rec/rec_gui/appmenu/app.desktop.in
@@ -6,4 +6,5 @@ Exec=@CMAKE_INSTALL_PREFIX@/@eCAL_install_app_dir@/ecal_@TARGET_NAME@ %f
 Terminal=false
 Type=Application
 Icon=ecal_@TARGET_NAME@
+MimeType=application/ecalrec
 Categories=Development;
diff --git a/app/rec/rec_gui/mimetype/application-ecalrec.svg b/app/rec/rec_gui/mimetype/application-ecalrec.svg
diff --git a/app/rec/rec_gui/mimetype/ecal-rec.xml b/app/rec/rec_gui/mimetype/ecal-rec.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/ecalrec">
+    <comment>Textfile with ecalrec markup</comment>
+    <glob pattern="*.ecalrec"/>
+  </mime-type>
+</mime-info>
diff --git a/app/sys/sys_gui/CMakeLists.txt b/app/sys/sys_gui/CMakeLists.txt
@@ -221,4 +221,13 @@ source_group( autogen FILES
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER app/sys)
 
+# install files required for linux mimetypes and icon
+if (UNIX)
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/ecal-sys.xml"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages/")
+
+    INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/application-ecalsys.svg"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes/")
+endif()
+
 ecal_install_app(${PROJECT_NAME} START_MENU_NAME "eCAL Sys")
diff --git a/app/sys/sys_gui/appmenu/app.desktop.in b/app/sys/sys_gui/appmenu/app.desktop.in
@@ -6,4 +6,5 @@ Exec=@CMAKE_INSTALL_PREFIX@/@eCAL_install_app_dir@/ecal_@TARGET_NAME@ %f
 Terminal=false
 Type=Application
 Icon=ecal_@TARGET_NAME@
+MimeType=application/ecalsys
 Categories=Development;
diff --git a/app/sys/sys_gui/mimetype/application-ecalsys.svg b/app/sys/sys_gui/mimetype/application-ecalsys.svg
diff --git a/app/sys/sys_gui/mimetype/ecal-sys.xml b/app/sys/sys_gui/mimetype/ecal-sys.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/ecalsys">
+    <comment>Textfile with ecalsys markup</comment>
+    <glob pattern="*.ecalsys"/>
+  </mime-type>
+</mime-info>
diff --git a/cpack/cpack_variables.cmake b/cpack/cpack_variables.cmake
@@ -54,6 +54,7 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Rex Schilasky <rex.schilasky@continental-co
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/continental/ecal")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/cpack/debscripts/postinst" "${CMAKE_BINARY_DIR}/cpack/debscripts/postrm")
 set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
 
 
diff --git a/cpack/debscripts/CMakeLists.txt b/cpack/debscripts/CMakeLists.txt
@@ -0,0 +1,10 @@
+set (PROJECT_NAME debscripts)
+
+if(UNIX)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/postinst.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/postinst"
+               @ONLY)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/postrm.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/postrm"
+               @ONLY)
+endif()
diff --git a/cpack/debscripts/postinst.in b/cpack/debscripts/postinst.in
@@ -0,0 +1,17 @@
+# Install the desktop entry
+if hash update-desktop-database 2>/dev/null; then
+	update-desktop-database
+fi
+
+# Update mimetype database to pickup workspace mimetype
+if hash update-mime-database 2>/dev/null; then
+	update-mime-database @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/mime/
+fi
+
+# Update icon database to pickup new icons
+if hash update-icon-caches 2>/dev/null; then
+    update-icon-caches @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/icons/
+fi
+
+# Due to multiarch install dirs, cmake fails to detect the necessity of ldconfig
+ldconfig
diff --git a/cpack/debscripts/postrm.in b/cpack/debscripts/postrm.in
@@ -0,0 +1,17 @@
+# Update the desktop entry
+if hash update-desktop-database 2>/dev/null; then
+	update-desktop-database
+fi
+
+# Update mimetype database for removed workspace mimetype
+if hash update-mime-database 2>/dev/null; then
+	update-mime-database @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/mime/
+fi
+
+# Update icon database for removed icon
+if hash update-icon-caches 2>/dev/null; then
+    update-icon-caches @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/icons/
+fi
+
+# Due to multiarch install dirs, cmake fails to detect the necessity of ldconfig
+ldconfig

Original file line number	Diff line number	Diff line change
`@@ -221,3 +221,12 @@ install(CODE`
`221`	`221`	`"`
`222`	`222`	`)`
`223`	`223`	`endif()`
	`224`	`+`
	`225`	`+# install files required for linux mimetypes and icon`
	`226`	`+if (UNIX)`
	`227`	`+ INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/ecal-play.xml"`
	`228`	`+ DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages/")`
	`229`	`+`
	`230`	`+ INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/application-ecalmeas.svg"`
	`231`	`+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes/")`
	`232`	`+endif()`
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,8 @@ namespace eCAL`
`255`	`255`
`256`	`256`	`if (ecalmeas_file.is_open())`
`257`	`257`	`{`
	`258`	`+ // For mimetypes to work, ecalmeas file should not be empty`
	`259`	`+ ecalmeas_file << std::string(" ");`
`258`	`260`	`ecalmeas_file.close();`
`259`	`261`	`files_with_metadata_.push_back(ecalmeas_file_name);`
`260`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,3 +257,12 @@ install(CODE`
`257`	`257`	`"`
`258`	`258`	`)`
`259`	`259`	`endif()`
	`260`	`+`
	`261`	`+# install files required for linux mimetypes and icon`
	`262`	`+if (UNIX)`
	`263`	`+ INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/ecal-rec.xml"`
	`264`	`+ DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages/")`
	`265`	`+`
	`266`	`+ INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/mimetype/application-ecalrec.svg"`
	`267`	`+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes/")`
	`268`	`+endif()`