Skip to content

Commit

Permalink
feat: Add support for amd64
Browse files Browse the repository at this point in the history
  • Loading branch information
@manueldidonna
manueldidonna committed Jul 22, 2024
1 parent dc2b095 commit d4fad9c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 8 deletions.
18 changes: 12 additions & 6 deletions Comic2Books.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
94565FD02C4F2471007E8DFD /* go-comic-converter-intel in Resources */ = {isa = PBXBuildFile; fileRef = 94565FCF2C4F2471007E8DFD /* go-comic-converter-intel */; };
9463018F2C48369600A4E2EE /* Comic2BooksApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9463018E2C48369600A4E2EE /* Comic2BooksApp.swift */; };
946301912C48369600A4E2EE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946301902C48369600A4E2EE /* ContentView.swift */; };
946301932C48369700A4E2EE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 946301922C48369700A4E2EE /* Assets.xcassets */; };
946301962C48369700A4E2EE /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 946301952C48369700A4E2EE /* Preview Assets.xcassets */; };
9463019E2C4878E900A4E2EE /* go-comic-converter-arm in Resources */ = {isa = PBXBuildFile; fileRef = 9463019D2C4878E900A4E2EE /* go-comic-converter-arm */; };
9463019E2C4878E900A4E2EE /* go-comic-converter-silicon in Resources */ = {isa = PBXBuildFile; fileRef = 9463019D2C4878E900A4E2EE /* go-comic-converter-silicon */; };
946301A32C487DFF00A4E2EE /* ImportedComicsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946301A22C487DFF00A4E2EE /* ImportedComicsList.swift */; };
946301A62C48842000A4E2EE /* UTType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946301A52C48842000A4E2EE /* UTType+Extensions.swift */; };
946301A92C488C0D00A4E2EE /* Comic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946301A82C488C0D00A4E2EE /* Comic.swift */; };
Expand All @@ -26,13 +27,14 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
94565FCF2C4F2471007E8DFD /* go-comic-converter-intel */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "go-comic-converter-intel"; sourceTree = "<group>"; };
9463018B2C48369600A4E2EE /* Comic2Books.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Comic2Books.app; sourceTree = BUILT_PRODUCTS_DIR; };
9463018E2C48369600A4E2EE /* Comic2BooksApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comic2BooksApp.swift; sourceTree = "<group>"; };
946301902C48369600A4E2EE /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
946301922C48369700A4E2EE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
946301952C48369700A4E2EE /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
946301972C48369700A4E2EE /* Comic2Books.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Comic2Books.entitlements; sourceTree = "<group>"; };
9463019D2C4878E900A4E2EE /* go-comic-converter-arm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "go-comic-converter-arm"; sourceTree = "<group>"; };
9463019D2C4878E900A4E2EE /* go-comic-converter-silicon */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "go-comic-converter-silicon"; sourceTree = "<group>"; };
946301A22C487DFF00A4E2EE /* ImportedComicsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportedComicsList.swift; sourceTree = "<group>"; };
946301A52C48842000A4E2EE /* UTType+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UTType+Extensions.swift"; sourceTree = "<group>"; };
946301A82C488C0D00A4E2EE /* Comic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comic.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -109,7 +111,8 @@
946301A12C487DC800A4E2EE /* Scripts */ = {
isa = PBXGroup;
children = (
9463019D2C4878E900A4E2EE /* go-comic-converter-arm */,
94565FCF2C4F2471007E8DFD /* go-comic-converter-intel */,
9463019D2C4878E900A4E2EE /* go-comic-converter-silicon */,
);
path = Scripts;
sourceTree = "<group>";
Expand Down Expand Up @@ -232,7 +235,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9463019E2C4878E900A4E2EE /* go-comic-converter-arm in Resources */,
9463019E2C4878E900A4E2EE /* go-comic-converter-silicon in Resources */,
94565FD02C4F2471007E8DFD /* go-comic-converter-intel in Resources */,
946301962C48369700A4E2EE /* Preview Assets.xcassets in Resources */,
946301932C48369700A4E2EE /* Assets.xcassets in Resources */,
);
Expand Down Expand Up @@ -386,6 +390,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = Comic2Books/Comic2Books.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -400,7 +405,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 0.1;
PRODUCT_BUNDLE_IDENTIFIER = me.manuelldidonna.Comic2Books;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -413,6 +418,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = Comic2Books/Comic2Books.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -427,7 +433,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 0.1;
PRODUCT_BUNDLE_IDENTIFIER = me.manuelldidonna.Comic2Books;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
18 changes: 16 additions & 2 deletions Comic2Books/App/Models/EPUBRequest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

struct EPUBRequest: Sendable {
static let outputDirectory: URL = .downloadsDirectory.appending(path: "Comic2Books")
static let scriptPath = Bundle.main.goComicConverterPath

struct Options: Hashable, Equatable, Sendable {
var device: Device = .standardResolution
Expand All @@ -31,10 +32,9 @@ struct EPUBRequest: Sendable {
private let destURL: URL

init(comic: Comic, options: Options) {
let script = Bundle.main.path(forResource: "go-comic-converter-arm", ofType: nil)!
destURL = Self.outputDirectory.appending(path: comic.title + ".epub")
commands = [
script,
Self.scriptPath,
options.appleBooksCompatibility
? "-applebookcompatibility"
: "-autosplitdoublepage=\(options.autoSplitDoublePage) -keepdoublepageifsplitted=\(options.keepDoublePageIfSplit)",
Expand Down Expand Up @@ -115,3 +115,17 @@ private extension EPUBRequest {
}
}
}

private extension Bundle {
var goComicConverterPath: String {
var utsname = utsname()
uname(&utsname)
let machine = withUnsafePointer(to: &utsname.machine) {
$0.withMemoryRebound(to: CChar.self, capacity: Int(_SYS_NAMELEN)) {
String(cString: $0)
}
}
let archSuffix = machine == "arm64" ? "silicon" : "intel"
return path(forResource: "go-comic-converter-\(archSuffix)", ofType: nil)!
}
}
Binary file added Comic2Books/Scripts/go-comic-converter-intel
View file
Binary file not shown.
0 Comic2Books/Scripts/go-comic-converter-arm → ...2Books/Scripts/go-comic-converter-silicon
View file
File renamed without changes.

0 comments on commit d4fad9c

Please sign in to comment.