Compare commits

...

51 Commits

Author SHA1 Message Date
Felix Rieseberg 6df468db4d v1.1.0 2021-01-03 19:38:56 -08:00
Felix Rieseberg 5320b29eed build: Build for all archs, update dependencies 2021-01-03 19:38:45 -08:00
Felix Rieseberg d5688df03f build: Build for all architectures 2021-01-03 19:32:12 -08:00
Felix Rieseberg e121c457af v1.0.7 2020-10-23 14:52:26 -07:00
Felix Rieseberg 45d061f051 build: Update dependencies 2020-10-23 14:52:19 -07:00
Felix Rieseberg d9a0353091 Merge pull request #74 from felixrieseberg/dependabot/npm_and_yarn/node-fetch-2.6.1
build(deps): Bump node-fetch from 2.6.0 to 2.6.1
2020-10-23 14:48:25 -07:00
Felix Rieseberg 9622100513 Merge pull request #81 from felixrieseberg/dependabot/npm_and_yarn/electron-10.1.2
build(deps-dev): Bump electron from 10.0.0-beta.12 to 10.1.2
2020-10-23 14:48:07 -07:00
dependabot[bot] 55b97251a0 build(deps-dev): Bump electron from 10.0.0-beta.12 to 10.1.2
Bumps [electron](https://github.com/electron/electron) from 10.0.0-beta.12 to 10.1.2.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v10.0.0-beta.12...v10.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-06 17:55:38 +00:00
dependabot[bot] 576200b489 build(deps): Bump node-fetch from 2.6.0 to 2.6.1
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-13 03:31:35 +00:00
Felix Rieseberg da7c0b1513 docs: Update readme 2020-08-03 15:50:50 -07:00
Felix Rieseberg f2d8191b0d chore: Remove unused master certs 2020-08-02 13:27:12 -07:00
Felix Rieseberg 3bd800d296 1.0.6 2020-08-02 13:13:29 -07:00
Felix Rieseberg 5e9570023b build: Allow Windows cert failure 2020-08-02 13:05:34 -07:00
Felix Rieseberg 64d8f4a382 build: Trying to fix GH actions 2020-08-02 12:58:02 -07:00
Felix Rieseberg de601111f9 build: Run on push to master 2020-08-02 12:55:30 -07:00
Felix Rieseberg 5c83088633 build: Only attempt to create code signature if secrets are set 2020-08-02 12:54:47 -07:00
Felix Rieseberg c73331bf6a feat: Handle toast and dsk images 2020-08-01 22:56:14 +00:00
Felix Rieseberg 9a1bbd40fb Merge pull request #45 from meeh0w/patch-1
Update README.md
2020-08-01 15:40:08 -07:00
Michał Leszczyk 1861b3b818 Update README.md 2020-07-31 18:34:59 +02:00
Felix Rieseberg 99c4e2e31c Merge pull request #43 from jonathanpotts/master
Update README with current download links
2020-07-31 09:16:45 -07:00
Jonathan Potts ec32c63b29 Update README.md 2020-07-30 22:52:05 -07:00
Jonathan Potts 09f4a9a3ed Update README.md 2020-07-30 22:51:35 -07:00
Felix Rieseberg d86d40f90d build: Icon for debian 2020-07-30 11:58:54 -07:00
Felix Rieseberg 7e32d63415 1.0.5 2020-07-30 11:49:50 -07:00
Felix Rieseberg 13f8d8bd7b Merge pull request #30 from jonathanpotts/master
Proposed fix for issue #6
2020-07-30 11:48:28 -07:00
Jonathan Potts 473033ba7b Update input.js
Make change according to https://github.com/felixrieseberg/macintosh.js/issues/6#issuecomment-665981700
2020-07-29 19:20:03 -07:00
Felix Rieseberg 5a4e6e6b37 docs: Update links 2020-07-29 12:15:03 -07:00
Felix Rieseberg 3aae0c143c 1.0.4 2020-07-29 12:05:20 -07:00
Felix Rieseberg e5c008887b fix: If you can't rename, copy 2020-07-29 12:05:14 -07:00
Felix Rieseberg 9cd62be64d chore: Update readme 2020-07-29 11:59:46 -07:00
Felix Rieseberg c72e1294c6 fix: Don't delete original disk 2020-07-29 11:43:12 -07:00
Felix Rieseberg f4c1e4dedb fix: Work out of user data dir, not app dir 2020-07-29 11:36:51 -07:00
Felix Rieseberg e2206e2ade 1.0.3 2020-07-29 10:02:59 -07:00
Felix Rieseberg 7aa3b3612f fix: Protect against prefs write failure 2020-07-29 08:40:17 -07:00
Felix Rieseberg 5b6079eb85 Merge pull request #12 from albuvee/patch-1
Update README.md
2020-07-29 08:28:38 -07:00
Felix Rieseberg 15834f9059 docs: Update the readme a little more 2020-07-29 08:27:34 -07:00
Stefan Rechsteiner 26f44cecd6 Update README.md 2020-07-29 10:17:29 +02:00
Felix Rieseberg 5ccdddde63 fix: Point to credits from readme 2020-07-28 18:57:03 -07:00
Felix Rieseberg a0aef16192 chore: Update readme links 2020-07-28 18:37:03 -07:00
Felix Rieseberg 8f7365e895 fix: Lint forever 2020-07-28 16:54:36 -07:00
Felix Rieseberg 572b00877c 1.0.2 2020-07-28 16:11:23 -07:00
Felix Rieseberg feb4465b5b fix: Credits & version info 2020-07-28 16:11:18 -07:00
Felix Rieseberg 27e4f4ed8d fix: Don't query updates on Linux 2020-07-28 16:07:11 -07:00
Felix Rieseberg 0e2e3d62ed chore: Update links 2020-07-28 15:45:24 -07:00
Felix Rieseberg e8a227fa1d 1.0.1 2020-07-28 15:11:48 -07:00
Felix Rieseberg b6ee882c2b fix: Don't load hidden files 2020-07-28 15:08:07 -07:00
Felix Rieseberg e07027130d fix: Correct border radius for canvas 2020-07-28 15:02:00 -07:00
Felix Rieseberg 66fce5effd fix: One more link 2020-07-28 12:56:29 -07:00
Felix Rieseberg a9c133c19a Merge pull request #3 from metaphox/patch-1
fix x64 win32 standalone link
2020-07-28 12:54:49 -07:00
Tao Wu 2a4ce913d5 fix x64 win32 standalone link 2020-07-28 21:31:27 +02:00
Felix Rieseberg b9f25ebf34 fix: One of the download links 2020-07-28 10:46:29 -07:00
14 changed files with 1000 additions and 748 deletions
+2 -1
View File
@@ -1 +1,2 @@
* text eol=lf
text eol=lf
rom -text
+4 -8
View File
@@ -3,7 +3,7 @@ name: Build & Release
on:
push:
branches:
# - master
- master
tags:
- v*
pull_request:
@@ -63,6 +63,7 @@ jobs:
MACOS_CERT_PASSWORD: ${{ secrets.MACOS_CERT_PASSWORD }}
- name: Set Windows signing certificate
if: matrix.os == 'windows-latest'
continue-on-error: true
id: write_file
uses: timheuer/base64-to-file@v1
with:
@@ -82,18 +83,12 @@ jobs:
run: yarn
- name: Make
if: startsWith(github.ref, 'refs/tags/')
run: yarn make
run: yarn make --arch=all
env:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
WINDOWS_CODESIGN_FILE: ${{ steps.write_file.outputs.filePath }}
WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
- name: Make (ia32)
if: matrix.os == 'windows-latest' && startsWith(github.ref, 'refs/tags/')
run: yarn make -- --arch=ia32
env:
WINDOWS_CODESIGN_FILE: ${{ steps.write_file.outputs.filePath }}
WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
# - name: Archive production artifacts
# uses: actions/upload-artifact@v2
# with:
@@ -105,6 +100,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
draft: true
files: |
out/**/*.deb
out/**/*.dmg
+2
View File
@@ -4,6 +4,8 @@ This app by <a href="https://www.felixrieseberg.com">Felix Rieseberg</a>. The re
**Emulator**: Basilisk II, a 68k Macintosh emulator, by [Christian Bauer et al](http://basilisk.cebix.net), modified and compiled [with Emscripten](https://jamesfriend.com.au/basilisk-ii-classic-mac-emulator-in-the-browser) by [James Friend](https://jamesfriend.com.au).
**Runtime**: The developers behind Electron, electron-forge, Chromium, Node.js.
**Installed software** from vintage computing archives: [WinWorldPC](https://winworldpc.com), [Macintosh Garden](https://macintoshgarden.org), and [Macintosh Repository](https://www.macintoshrepository.org/).
This software is not affiliated with nor authorized by Apple. It is provided for educational purposes only. This is an unstable toy and should not be expected to work properly.
+11 -3
View File
@@ -8,11 +8,11 @@ This is Mac OS 8, running in an [Electron](https://electronjs.org/) app pretendi
| | Windows | macOS | Linux |
|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Standalone Download | 📦[Standalone, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintosh.js-win32-x64-1.0.0.zip) <br /> 📦[Standalone, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintosh.js-win32-ia32-1.0.0.zip) | 📦[Standalone](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintosh.js-darwin-x64-1.0.0.zip) | |
| Installer | 💽[Setup, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintoshjs-1.0.0-setup-x64.exe) <br /> 💽[Setup, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintoshjs-1.0.0-setup-ia32.exe) | | 💽[deb, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintosh.js_1.0.0_amd64.deb) <br /> 💽[rpm, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.0/macintosh.js-1.0.0-1.x86_64.rpm) |
| Standalone Download | 📦[Standalone, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-win32-ia32-1.0.6.zip) <br /> 📦[Standalone, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-win32-x64-1.0.6.zip) | 📦[Standalone](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-darwin-x64-1.0.6.zip) | |
| Installer | 💽[Setup, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintoshjs-1.0.6-setup-x64.exe) <br /> 💽[Setup, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintoshjs-1.0.6-setup-ia32.exe) | | 💽[deb, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js_1.0.6_amd64.deb) <br /> 💽[rpm, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-1.0.6-1.x86_64.rpm) |
## Does it work?
Yes! Quite well, actually - on macOS, Windows, and Linux. Bear in mind that this is written entirely in JavaScript, so please adjust your expectations. The virtual machine is emulating a 1991 Macintosh Quadra 900 with a Motorola CPU, which Apple used before switching to IBM's PowerPC architecture in the late 1990s.
Yes! Quite well, actually - on macOS, Windows, and Linux. Bear in mind that this is written entirely in JavaScript, so please adjust your expectations. The virtual machine is emulating a 1991 Macintosh Quadra 900 with a Motorola CPU, which Apple used before switching to the PowerPC architecture (Apple/IBM/Motorola) in the mid 1990s.
## Should this have been a native app?
Absolutely.
@@ -30,6 +30,14 @@ Yes, you can. Click on the "Help" button at the bottom of the running app to see
No. For what it's worth, the web was quite different 30 years ago - and you wouldn't be able to open even Google. However, Internet Explorer and Netscape are installed, as is the "Web Sharing Server", if you want to play around a bit.
## Should I use this for [serious application]?
Probably not. This is a toy - it's not the best nor the most performant way to emulate an old Macintosh. It is, however, a quick and easy way to experience a bit of nostalgia if you're _not_ trying to do anything serious with it.
## Credits
Please check out the [CREDITS](CREDITS.md)! This app wouldn't be possible without the hard work of [Christian Bauer](https://www.cebix.net/) and [James Friend](https://jamesfriend.com.au/), who did everything that seems like computing magic here.
## License
This project is provided for educational purposes only. It is not affiliated with and has
Binary file not shown.
Binary file not shown.
+9 -1
View File
@@ -75,7 +75,15 @@ module.exports = {
},
{
name: '@electron-forge/maker-deb',
platforms: ['linux']
platforms: ['linux'],
options: {
maintainer: 'Felix Rieseberg',
homepage: 'https://github.com/felixrieseberg/macintosh.js',
categories: [
'Education',
],
icon: path.resolve(__dirname, 'assets', 'icon.png')
}
},
{
name: '@electron-forge/maker-rpm',
+8 -8
View File
@@ -1,7 +1,7 @@
{
"name": "macintosh.js",
"productName": "macintosh.js",
"version": "1.0.0",
"version": "1.1.0",
"description": "Macintosh's System 8 in an Electron app. I'm sorry.",
"main": "src/main/index.js",
"scripts": {
@@ -23,14 +23,14 @@
},
"dependencies": {
"electron-squirrel-startup": "^1.0.0",
"update-electron-app": "^1.5.0"
"update-electron-app": "^2.0.1"
},
"devDependencies": {
"@electron-forge/cli": "6.0.0-beta.52",
"@electron-forge/maker-deb": "6.0.0-beta.52",
"@electron-forge/maker-rpm": "6.0.0-beta.52",
"@electron-forge/maker-squirrel": "6.0.0-beta.52",
"@electron-forge/maker-zip": "6.0.0-beta.52",
"electron": "10.0.0-beta.12"
"@electron-forge/cli": "6.0.0-beta.54",
"@electron-forge/maker-deb": "6.0.0-beta.54",
"@electron-forge/maker-rpm": "6.0.0-beta.54",
"@electron-forge/maker-squirrel": "6.0.0-beta.54",
"@electron-forge/maker-zip": "6.0.0-beta.54",
"electron": "11.1.1"
}
}
+151 -153
View File
@@ -1,6 +1,5 @@
const fs = require("fs");
const path = require("path");
const { error } = require("console");
const homeDir = require("os").homedir();
const macDir = path.join(homeDir, "macintosh.js");
@@ -10,7 +9,25 @@ const macintoshCopyPath = path.join(__dirname, "user_files");
let userDataPath;
function getUserDataDiskPath() {
return path.join(userDataPath, 'disk');
return path.join(userDataPath, "disk");
}
// File type utilities
function isFile(v = "") {
return fs.statSync(path.join(macDir, v)).isFile();
}
function isHiddenFile(filename = '') {
return filename.startsWith('.');
}
function isCDImage(filename = '') {
return filename.endsWith('.iso') || filename.endsWith('.toast');
}
function isDiskImage(filename = '') {
return filename.endsWith('.img') || filename.endsWith('.dsk');
}
function cleanupCopyPath() {
@@ -32,101 +49,101 @@ function getUserDataDiskImage() {
}
const diskImageUserPath = getUserDataDiskPath();
const diskImagePath = path.join(__dirname, 'disk');
const diskImagePath = path.join(__dirname, "disk");
// If there's a disk image, move it over
if (fs.existsSync(diskImageUserPath)) {
// Delete a possible basilisk disk image
if (fs.existsSync(diskImagePath)) {
console.log(`Disk image ${diskImageUserPath} exists, deleting ${diskImagePath}`);
fs.unlinkSync(diskImagePath);
if (!fs.existsSync(diskImageUserPath)) {
try {
fs.renameSync(diskImagePath, diskImageUserPath);
} catch (error) {
// This is _probably_ a permissions thing, let's copy the file
fs.copyFileSync(diskImagePath, diskImageUserPath);
}
fs.renameSync(diskImageUserPath, diskImagePath);
} else {
console.log(`getUserDataDiskImage: No image in user data dir, not doing anything`);
console.log(
`getUserDataDiskImage: Image in user data dir, not doing anything`
);
}
}
function addAutoloader(module) {
const copyFilesAtPath = function (sourcePath) {
try {
const absoluteSourcePath = path.join(macDir, sourcePath);
const absoluteTargetPath = path.join(macintoshCopyPath, sourcePath);
const targetPath = `/macintosh.js${sourcePath ? `/${sourcePath}` : ""}`;
const files = fs.readdirSync(absoluteSourcePath).filter((v) => {
// Remove iso and img files
return !v.endsWith(".iso") && !v.endsWith(".img");
});
// Taken a given path, it'll look at all the files in there,
// copy them over to the basilisk folder, and then add them
// to MEMFS
function preloadFilesAtPath(module, initalSourcePath) {
try {
const sourcePath = path.join(macDir, initalSourcePath);
const targetPath = `/macintosh.js${
initalSourcePath ? `/${initalSourcePath}` : ""
}`;
const files = fs.readdirSync(sourcePath).filter((v) => {
// Remove hidden, iso, and img files
return !isHiddenFile(v) && !isDiskImage(v) && !isCDImage(v);
});
(files || []).forEach((fileName) => {
try {
// If not, let's move on
const fileSourcePath = path.join(absoluteSourcePath, fileName);
const copyPath = path.join(absoluteTargetPath, fileName);
const relativeSourcePath = `${
sourcePath ? `${sourcePath}/` : ""
}${fileName}`;
const fileUrl = `user_files/${relativeSourcePath}`;
(files || []).forEach((fileName) => {
try {
// If not, let's move on
const fileSourcePath = path.join(sourcePath, fileName);
const relativeSourcePath = `${
initalSourcePath ? `${initalSourcePath}/` : ""
}${fileName}`;
// Check if directory
if (fs.statSync(fileSourcePath).isDirectory()) {
if (!fs.existsSync(copyPath)) {
fs.mkdirSync(copyPath);
}
try {
const virtualDirPath = `${targetPath}/${fileName}`;
module.FS.mkdir(virtualDirPath);
} catch (error) {
console.log(error);
}
copyFilesAtPath(relativeSourcePath);
return;
// Check if directory
if (fs.statSync(fileSourcePath).isDirectory()) {
try {
const virtualDirPath = `${targetPath}/${fileName}`;
module.FS.mkdir(virtualDirPath);
} catch (error) {
console.log(error);
}
// We copy the files over and then add them as preload
console.log(`loadDatafiles: Adding ${fileName}`);
fs.copyFileSync(fileSourcePath, copyPath);
module.FS_createPreloadedFile(
targetPath,
fileName,
fileUrl,
true,
true
);
} catch (error) {
postMessage("showMessageBoxSync", {
type: "error",
title: "Could not transfer file",
message: `We tried to transfer ${fileName} to the virtual machine, but failed. The error was: ${error}`,
});
console.error(`loadDatafiles: Failed to preload ${fileName}`, error);
preloadFilesAtPath(module, relativeSourcePath);
return;
}
});
} catch (error) {
postMessage("showMessageBoxSync", {
type: "error",
title: "Could not transfer files",
message: `We tried to transfer files to the virtual machine, but failed. The error was: ${error}`,
});
console.error(`loadDatafiles: Failed to copyFilesAtPath`, error);
}
};
createPreloadedFile(module, {
parent: targetPath,
name: fileName,
url: fileSourcePath,
});
} catch (error) {
postMessage("showMessageBoxSync", {
type: "error",
title: "Could not transfer file",
message: `We tried to transfer ${fileName} to the virtual machine, but failed. The error was: ${error}`,
});
const loadDatafiles = function () {
module.autoloadFiles.forEach((filepath) => {
const parent = `/`;
const name = path.basename(filepath);
console.log(`Adding preload file`, { parent, name, url: filepath });
module.FS_createPreloadedFile(parent, name, filepath, true, true);
console.error(
`preloadFilesAtPath: Failed to preload ${fileName}`,
error
);
}
});
} catch (error) {
postMessage("showMessageBoxSync", {
type: "error",
title: "Could not transfer files",
message: `We tried to transfer files to the virtual machine, but failed. The error was: ${error}`,
});
console.error(`preloadFilesAtPath: Failed to preloadFilesAtPath`, error);
}
}
function createPreloadedFile(module, options) {
const parent = options.parent || `/`;
const name = options.name || path.basename(options.url);
const url = options.url;
console.log(`Adding preload file`, { parent, name, url });
module.FS_createPreloadedFile(parent, name, url, true, true);
}
function addAutoloader(module) {
const loadDatafiles = function () {
module.autoloadFiles.forEach(({ url, name }) =>
createPreloadedFile(module, { url, name })
);
// If the user has a macintosh.js dir, we'll copy over user
// data
@@ -134,7 +151,8 @@ function addAutoloader(module) {
return;
}
copyFilesAtPath("");
// Load user files
preloadFilesAtPath(module, "");
};
if (module.autoloadFiles) {
@@ -178,22 +196,23 @@ function writeSafely(filePath, fileData) {
});
}
function getPrefs(userImages = []) {
function writePrefs(userImages = []) {
try {
const prefsTemplatePath = path.join(__dirname, "prefs_template");
const prefsPath = path.join(__dirname, "prefs");
const prefsPath = path.join(userDataPath, "prefs");
let prefs = fs.readFileSync(prefsTemplatePath, { encoding: "utf-8" });
// Replace line endings, just in case
prefs = prefs.replaceAll('\r\n', '\n');
prefs = prefs.replaceAll("\r\n", "\n");
if (userImages && userImages.length > 0) {
console.log(`getPrefs: Found ${userImages.length} user images`);
userImages.forEach((file) => {
if (file.endsWith(".iso")) {
prefs += `\ncdrom ${file}`;
} else if (file.endsWith(".img")) {
prefs += `\ndisk ${file}`;
console.log(`writePrefs: Found ${userImages.length} user images`);
userImages.forEach(({ name }) => {
if (isCDImage(name)) {
prefs += `\ncdrom ${name}`;
} else if (isDiskImage(name)) {
prefs += `\ndisk ${name}`;
}
});
}
@@ -202,81 +221,60 @@ function getPrefs(userImages = []) {
fs.writeFileSync(prefsPath, prefs);
} catch (error) {
console.error(`getPrefs: Failed to set prefs`, error);
console.error(`writePrefs: Failed to set prefs`, error);
}
return "prefs";
}
function isMacDirFileOfType(extension = "", v = "") {
const isType = v.endsWith(`.${extension}`);
const isMatch = isType && fs.statSync(path.join(macDir, v)).isFile();
console.log(`isMacDirFileOfType: ${v} is file and ${extension}: ${isMatch}`);
return isMatch;
}
function copyUserImages() {
function getUserImages() {
const result = [];
try {
// No need if the macDir doesn't exist
if (!fs.existsSync(macDir)) {
console.log(`autoMountImageFiles: ${macDir} does not exist, exit`);
console.log(`getUserImages: ${macDir} does not exist, exit`);
return result;
}
const macDirFiles = fs.readdirSync(macDir);
const imgFiles = macDirFiles.filter((v) => isMacDirFileOfType("img", v));
const isoFiles = macDirFiles.filter((v) => isMacDirFileOfType("iso", v));
const imgFiles = macDirFiles.filter((v) => isFile(v) && isDiskImage(v));
const isoFiles = macDirFiles.filter((v) => isFile(v) && isCDImage(v));
const isoImgFiles = [...isoFiles, ...imgFiles];
console.log(`copyUserImages: iso and img files`, isoImgFiles);
console.log(`getUserImages: iso and img files`, isoImgFiles);
isoImgFiles.forEach((fileName, i) => {
const sourcePath = path.join(macDir, fileName);
const url = path.join(macDir, fileName);
const sanitizedFileName = `user_image_${i}_${fileName.replace(
/[^\w\s\.]/gi,
""
)}`;
const targetPath = path.join(__dirname, sanitizedFileName);
if (fs.existsSync(targetPath)) {
const sourceStat = fs.statSync(sourcePath);
const targetStat = fs.statSync(targetPath);
// Copy if the length is different
if (sourceStat.size !== targetStat.size) {
fs.copyFileSync(sourcePath, targetPath);
} else {
console.log(
`autoMountImageFiles: ${sourcePath} already exists in ${targetPath}, not copying`
);
}
} else {
fs.copyFileSync(sourcePath, targetPath);
}
console.log(`Copied over ${targetPath}`);
result.push(sanitizedFileName);
});
// Delete all old files
const imagesCopyFiles = fs.readdirSync(__dirname);
imagesCopyFiles.forEach((v) => {
if (v.startsWith("user_image_") && !result.includes(v)) {
fs.unlinkSync(path.join(__dirname, v));
}
result.push({ url, name: sanitizedFileName });
});
} catch (error) {
console.error(`copyUserImages: Encountered error`, error);
console.error(`getUserImages: Encountered error`, error);
}
return result;
}
function getAutoLoadFiles(userImages = []) {
const autoLoadFiles = ["disk", "rom", "prefs", ...userImages];
const autoLoadFiles = [
{
name: "disk",
url: path.join(userDataPath, "disk"),
},
{
name: "rom",
url: path.join(__dirname, "rom"),
},
{
name: "prefs",
url: path.join(userDataPath, "prefs"),
},
...userImages,
];
return autoLoadFiles;
}
@@ -358,7 +356,6 @@ self.onmessage = async function (msg) {
if (msg && msg.data === "disk_save") {
const diskData = Module.FS.readFile("/disk");
const diskPath = getUserDataDiskPath();
const basiliskDiskPath = path.join(__dirname, 'disk');
// I wish we could do this with promises, but OOM crashes kill that idea
try {
@@ -369,14 +366,6 @@ self.onmessage = async function (msg) {
console.error(`Failed to write disk`, error);
}
try {
if (fs.existsSync(basiliskDiskPath) && !(Module && Module.isDevMode)) {
fs.unlinkSync(basiliskDiskPath);
}
} catch (error) {
console.error(`Failed to delete ${basiliskDiskPath}`);
}
// Now, user files
console.log(`Saving user files`);
await saveFilesInPath("/macintosh.js");
@@ -479,14 +468,23 @@ function startEmulator(parentConfig) {
let AudioConfig = null;
let AudioBufferQueue = [];
const userImages = copyUserImages();
// Check for user images
const userImages = getUserImages();
// Write prefs to user data dir
writePrefs(userImages);
// Assemble preload files
const autoloadFiles = getAutoLoadFiles(userImages);
// Set arguments
const arguments = ["--config", "prefs"];
Module = {
autoloadFiles: getAutoLoadFiles(userImages),
userImages: userImages,
arguments: ["--config", getPrefs(userImages)],
autoloadFiles,
userImages,
arguments,
canvas: null,
blit: function blit(bufPtr, width, height, depth, usingPalette) {
+1 -1
View File
@@ -1,7 +1,7 @@
const { app } = require("electron");
function setupUpdates() {
if (app.isPackaged) {
if (app.isPackaged && process.platform !== "linux") {
require("update-electron-app")({
repo: "felixrieseberg/macintosh.js",
updateInterval: "1 hour",
+1 -2
View File
@@ -1,8 +1,7 @@
const { shell, ipcRenderer } = require("electron");
const path = require("path");
const { versions } = require("process");
const { getAppVersion } = require("./ipc.js");
const { getAppVersion } = require("./ipc");
async function credits() {
license.onclick = () => {
+3 -2
View File
@@ -43,8 +43,9 @@ function tryToSendInput() {
switch (inputEvent.type) {
case "mousemove":
hasMouseMove = true;
mouseMoveX += inputEvent.dx;
mouseMoveY += inputEvent.dy;
// Make change according to https://github.com/felixrieseberg/macintosh.js/issues/6#issuecomment-665981700
mouseMoveX = inputEvent.dx;
mouseMoveY = inputEvent.dy;
break;
case "mousedown":
case "mouseup":
+7
View File
@@ -10,6 +10,13 @@
cursor: none;
}
canvas {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-bottom-left-radius: 9px;
border-bottom-right-radius: 9px;
}
.controls {
text-align: center;
margin-top: 5px;
+801 -569
View File
File diff suppressed because it is too large Load Diff