Merge pull request #422 from gokulprathin8/osx/dmg-deployment

MacOS App for Geoweaver

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  build-jar:
     runs-on: ubuntu-latest
 
     steps:
@@ -36,22 +36,19 @@ jobs:
       - name: Append version to DEBIAN/control
         run: |
           echo "Version: ${{ env.VERSION }}" >> $GITHUB_WORKSPACE/linux-deployment/DEBIAN/control
-          
+
       - name: Set execute permissions for postinst script
         run: chmod 755 $GITHUB_WORKSPACE/linux-deployment/DEBIAN/postinst
 
       - name: Copy geoweaver.jar to linux-deployment directory
-        run: |
-          ls $GITHUB_WORKSPACE/target/
-          cp $GITHUB_WORKSPACE/target/geoweaver.jar $GITHUB_WORKSPACE/linux-deployment/usr/local/bin/
+        run: cp $GITHUB_WORKSPACE/target/geoweaver.jar $GITHUB_WORKSPACE/linux-deployment/usr/local/bin/
 
       - name: Make geoweaver.sh executable
         run: chmod +x $GITHUB_WORKSPACE/linux-deployment/usr/local/bin/geoweaver.sh
 
       - name: Build deb package
         run: |
           cd $GITHUB_WORKSPACE/linux-deployment
-          cat DEBIAN/control
           dpkg-deb --build . geoweaver.deb
 
       - name: Upload Geoweaver Artifacts
@@ -63,8 +60,46 @@ jobs:
             pom.xml
             linux-deployment/*.deb
 
+  build-macos:
+    needs: build-jar
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download Geoweaver Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: geoweaver-artifacts
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      - name: Build .app file
+        run: |
+          chmod +x ${GITHUB_WORKSPACE}/macos-deployment/make-app.sh
+          ${GITHUB_WORKSPACE}/macos-deployment/make-app.sh
+
+      - name: Create .dmg file with Applications shortcut
+        run: |
+          APP_NAME="Geoweaver"
+          DMG_TEMP_DIR="${GITHUB_WORKSPACE}/dmg_temp"
+          mkdir -p "${DMG_TEMP_DIR}"
+          cp -r "${GITHUB_WORKSPACE}/geoweaver.app" "${DMG_TEMP_DIR}"
+          ln -s /Applications "${DMG_TEMP_DIR}/Applications"
+          hdiutil create -volname "$APP_NAME" -srcfolder "${DMG_TEMP_DIR}" -ov -format UDZO "${GITHUB_WORKSPACE}/${APP_NAME}.dmg"
+      - name: Upload .dmg file as an artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: geoweaver-dmg
+          path: /Users/runner/work/Geoweaver/Geoweaver/Geoweaver.dmg
+
   release:
-    needs: build
+    needs: [build-jar, build-macos]
     runs-on: ubuntu-latest
 
     steps:
@@ -79,22 +114,18 @@ jobs:
         with:
           name: geoweaver-artifacts
 
+      - name: Download .dmg file
+        uses: actions/download-artifact@v2
+        with:
+          name: geoweaver-dmg
+
       - name: Get ID and upload URL of the latest release
         run: |
           RESPONSE=$(curl -s -H "Authorization: token ${{ secrets.PAT }}" "https://api.github.com/repos/${{ github.repository }}/releases/latest")
           UPLOAD_URL=$(echo "$RESPONSE" | jq -r .upload_url)
           RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
           echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
           echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
-          # Use the 'find' command to list all subfolders within the specified folder
-          folder_path=$GITHUB_WORKSPACE
-          # The '-type d' flag ensures that only directories are selected
-          subfolders=$(find "$folder_path" -type d)
-
-          # Loop through the subfolders and print their names
-          for subfolder in $subfolders; do
-              echo "$subfolder"
-          done
 
       - name: Set release title to version
         run: |
@@ -123,3 +154,13 @@ jobs:
           asset_content_type: application/vnd.debian.binary-package
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
+
+      - name: Upload .dmg file to Release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ env.UPLOAD_URL }}
+          asset_path: Geoweaver.dmg
+          asset_name: Geoweaver.dmg
+          asset_content_type: application/x-diskcopy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

macos-deployment/make-app.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+APP_NAME="Geoweaver"
+REPO_NAME="Geoweaver"
+APP_DIR="${GITHUB_WORKSPACE}/${APP_NAME}.app"
+JAR_PATH="${GITHUB_WORKSPACE}/target/geoweaver.jar"
+ICON_PATH="${GITHUB_WORKSPACE}/linux-deployment/usr/local/bin/geoweaver.png"
+
+mkdir -p "${APP_DIR}/Contents/MacOS"
+mkdir -p "${APP_DIR}/Contents/Resources"
+mkdir -p "${APP_DIR}/Contents/Java"
+
+cp "${JAR_PATH}" "${APP_DIR}/Contents/Java/"
+
+EXECUTABLE_SCRIPT="${APP_DIR}/Contents/MacOS/${APP_NAME}"
+cat > "${EXECUTABLE_SCRIPT}" <<EOF
+#!/bin/bash
+DIR=\$(dirname "\$0")
+nohup java -jar "\$DIR/../Java/geoweaver.jar" > /dev/null 2>&1 &
+sleep 7
+open http://localhost:8070/Geoweaver
+EOF
+
+chmod +x "${EXECUTABLE_SCRIPT}"
+
+INFO_PLIST="${APP_DIR}/Contents/Info.plist"
+cat > "${INFO_PLIST}" <<EOF
+<?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>CFBundleExecutable</key>
+  <string>${APP_NAME}</string>
+  <key>CFBundleIconFile</key>
+  <string>AppIcon</string>
+  <key>CFBundleIdentifier</key>
+  <string>com.gokulprathin.geoweaver</string>
+  <key>CFBundleName</key>
+  <string>${APP_NAME}</string>
+  <key>CFBundleVersion</key>
+  <string>1.0.0</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+</dict>
+</plist>
+EOF
+
+ICONSET="${APP_DIR}/Contents/Resources/${APP_NAME}.iconset"
+mkdir "${ICONSET}"
+
+sips -z 16 16     "${ICON_PATH}" --out "${ICONSET}/icon_16x16.png"
+sips -z 32 32     "${ICON_PATH}" --out "${ICONSET}/icon_32x32.png"
+sips -z 128 128   "${ICON_PATH}" --out "${ICONSET}/icon_128x128.png"
+sips -z 256 256   "${ICON_PATH}" --out "${ICONSET}/icon_256x256.png"
+sips -z 512 512   "${ICON_PATH}" --out "${ICONSET}/icon_512x512.png"
+cp "${ICON_PATH}" "${ICONSET}/icon_1024x1024.png"  # Assuming the original PNG is at least 1024x1024
+
+iconutil -c icns "${ICONSET}" --output "${APP_DIR}/Contents/Resources/AppIcon.icns"
+rm -rf "${ICONSET}"
+echo "${APP_NAME}.app has been created on your Desktop."

src/main/java/com/gw/tools/WorkflowTool.java

@@ -971,31 +971,24 @@ public String saveWorkflowFromFolder(String wid, String foldername) throws Parse
 
 		this.save(w);
 
-		// save history
-		File[] files = new File(historyfolder).listFiles();
 
+		List<History> historyList = new ArrayList<>();
+		File[] files = new File(historyfolder).listFiles();
 		if (files != null) {
-
 			for (File file : files) {
-
 				String historyjson = bt.readStringFromFile(file.getAbsolutePath());
-
 				JSONArray historyarray = (JSONArray) jsonparser.parse(historyjson);
 
 				historyarray.forEach((obj) -> {
-
 					String jsonobj = ((JSONObject) obj).toJSONString();
-
 					History hist = historyFromJSON(jsonobj);
-
-					historyrepository.save(hist);
-					// historyrepository.saveJSON(jsonobj);
+					historyList.add(hist);
 				});
-
 			}
-
 		}
 
+		historyrepository.saveAll(historyList);
+
 		// save process
 		String processjson = bt.readStringFromFile(codefolder + "process.json");