feat: Different icons for application/file extension with same name on macOS and Windows

develar · develar · commit 04f11f60733a · 2017-02-15T21:50:03.000+01:00
Close #1268
diff --git a/packages/electron-builder/src/metadata.ts b/packages/electron-builder/src/metadata.ts
@@ -347,7 +347,10 @@ export interface Macros {
 }
 
 export function getPlatformIconFileName(value: string | null | undefined, isMac: boolean) {
-  if (value == null) {
+  if (value === undefined) {
+    return undefined
+  }
+  if (value === null) {
     return null
   }
 
diff --git a/packages/electron-builder/src/platformPackager.ts b/packages/electron-builder/src/platformPackager.ts
@@ -510,7 +510,14 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
       }
     }
     else if (!isEmptyOrSpaces(custom)) {
-      return path.resolve(this.projectDir, custom)
+      let p = path.resolve(this.buildResourcesDir, custom)
+      if (await statOrNull(p) == null) {
+        p = path.resolve(this.projectDir, custom)
+        if (await statOrNull(p) == null) {
+          throw new Error(`Cannot find specified resource "${custom}", nor relative to "${this.buildResourcesDir}", neither relative to project dir ("${this.projectDir}")`)
+        }
+      }
+      return p
     }
     return null
   }
diff --git a/test/out/mac/__snapshots__/macPackagerTest.js.snap b/test/out/mac/__snapshots__/macPackagerTest.js.snap
@@ -20,6 +20,14 @@ Object {
       "CFBundleTypeRole": "Shell",
       "LSTypeIsPackage": true,
     },
+    Object {
+      "CFBundleTypeExtensions": Array [
+        "bar",
+      ],
+      "CFBundleTypeIconFile": "someFoo.icns",
+      "CFBundleTypeName": "Bar",
+      "CFBundleTypeRole": "Shell",
+    },
   ],
   "CFBundleExecutable": "Test App ßW",
   "CFBundleIconFile": "Test App ßW.icns",
diff --git a/test/src/mac/macPackagerTest.ts b/test/src/mac/macPackagerTest.ts
@@ -5,6 +5,7 @@ import { readJson } from "fs-extra-p"
 import * as path from "path"
 import { assertThat } from "../helpers/fileAssert"
 import { app, appThrows, assertPack, convertUpdateInfo, platform } from "../helpers/packTester"
+import BluebirdPromise from "bluebird-lst-c"
 
 test.ifMac("two-package", () => assertPack("test-app", {targets: createTargets([Platform.MAC], null, "all")}, {signed: true, useTempDir: true}))
 
@@ -31,15 +32,26 @@ test.ifMac("one-package", app({
           role: "Shell",
           isPackage: true,
         },
+        {
+          ext: "bar",
+          name: "Bar",
+          role: "Shell",
+          // If I specify `fileAssociations.icon` as `build/lhtmldoc.icns` will it know to use `build/lhtmldoc.ico` for Windows?
+          icon: "someFoo.ico"
+        },
       ]
     }
   }
 }, {
   signed: true,
-  projectDirCreated: projectDir => copyFile(path.join(projectDir, "build", "icon.icns"), path.join(projectDir, "build", "foo.icns")),
+  projectDirCreated: projectDir => BluebirdPromise.all([
+    copyFile(path.join(projectDir, "build", "icon.icns"), path.join(projectDir, "build", "foo.icns")),
+    copyFile(path.join(projectDir, "build", "icon.icns"), path.join(projectDir, "build", "someFoo.icns")),
+  ]),
   checkMacApp: async (appDir, info) => {
     expect(info).toMatchSnapshot()
     await assertThat(path.join(appDir, "Contents", "Resources", "foo.icns")).isFile()
+    await assertThat(path.join(appDir, "Contents", "Resources", "someFoo.icns")).isFile()
   },
   packed: async context => {
     expect(convertUpdateInfo(await readJson(path.join(context.outDir, "latest-mac.json")))).toMatchSnapshot()

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,10 @@ export interface Macros {`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`export function getPlatformIconFileName(value: string \| null \| undefined, isMac: boolean) {`
`350`		`- if (value == null) {`
	`350`	`+ if (value === undefined) {`
	`351`	`+ return undefined`
	`352`	`+ }`
	`353`	`+ if (value === null) {`
`351`	`354`	`return null`
`352`	`355`	`}`
`353`	`356`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,14 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>`
`510`	`510`	`}`
`511`	`511`	`}`
`512`	`512`	`else if (!isEmptyOrSpaces(custom)) {`
`513`		`- return path.resolve(this.projectDir, custom)`
	`513`	`+ let p = path.resolve(this.buildResourcesDir, custom)`
	`514`	`+ if (await statOrNull(p) == null) {`
	`515`	`+ p = path.resolve(this.projectDir, custom)`
	`516`	`+ if (await statOrNull(p) == null) {`
	`517`	+ throw new Error(`Cannot find specified resource "${custom}", nor relative to "${this.buildResourcesDir}", neither relative to project dir ("${this.projectDir}")`)
	`518`	`+ }`
	`519`	`+ }`
	`520`	`+ return p`
`514`	`521`	`}`
`515`	`522`	`return null`
`516`	`523`	`}`