Compare commits
11 Commits
da1b05c9a1
...
1.1.2
Author | SHA1 | Date | |
---|---|---|---|
b111cf4fa4 | |||
e2713179c8 | |||
92ee92d636 | |||
b3463378e9 | |||
00e3e80d43 | |||
2df9f533fe | |||
cc93e24ab6 | |||
48cd81f28d | |||
068d02f1f7 | |||
e725592ef1 | |||
6bc0b215d7 |
2
app.js
2
app.js
@@ -91,7 +91,7 @@ const run = () => {
|
|||||||
rpcOsuVersion = splitArray[0];
|
rpcOsuVersion = splitArray[0];
|
||||||
currentMap = splitArray[1];
|
currentMap = splitArray[1];
|
||||||
if (currentMap.endsWith(".osu")) {
|
if (currentMap.endsWith(".osu")) {
|
||||||
rpc.updateState("Editing...");
|
rpc.updateState("Editing/Modding...");
|
||||||
currentMap = currentMap.substring(0, currentMap.length - 4);
|
currentMap = currentMap.substring(0, currentMap.length - 4);
|
||||||
}
|
}
|
||||||
else rpc.updateState("Playing...");
|
else rpc.updateState("Playing...");
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
const appName = "EZPPLauncher"
|
const appName = "EZPPLauncher"
|
||||||
const appVersion = "1.1.1";
|
const appVersion = "1.1.2";
|
||||||
|
|
||||||
module.exports = { appName, appVersion };
|
module.exports = { appName, appVersion };
|
@@ -7,22 +7,23 @@ let client = undefined;
|
|||||||
let lastState = "Idle in Launcher...";
|
let lastState = "Idle in Launcher...";
|
||||||
let presenceEnabled = true;
|
let presenceEnabled = true;
|
||||||
let startDate = new Date();
|
let startDate = new Date();
|
||||||
|
const actionButtons = [
|
||||||
|
{
|
||||||
|
label: "Download the Launcher",
|
||||||
|
url: "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Join EZPPFarm",
|
||||||
|
url: "https://ez-pp.farm/discord"
|
||||||
|
}
|
||||||
|
]
|
||||||
let lastActivity = {
|
let lastActivity = {
|
||||||
details: " ",
|
details: " ",
|
||||||
state: lastState,
|
state: lastState,
|
||||||
startTimestamp: startDate,
|
startTimestamp: startDate,
|
||||||
largeImageKey: "ezppfarm",
|
largeImageKey: "ezppfarm",
|
||||||
largeImageText: appInfo.appName + " " + appInfo.appVersion,
|
largeImageText: appInfo.appName + " " + appInfo.appVersion,
|
||||||
buttons: [
|
buttons: actionButtons,
|
||||||
{
|
|
||||||
label: "Download the Launcher",
|
|
||||||
url: "https://ez-pp.farm/download"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Join EZPPFarm",
|
|
||||||
url: "https://discord.com/invite/g8Bh7RaKPg"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
instance: false,
|
instance: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -53,16 +54,7 @@ module.exports = {
|
|||||||
smallImageText: osuVersion ? osuVersion : " ",
|
smallImageText: osuVersion ? osuVersion : " ",
|
||||||
largeImageKey: "ezppfarm",
|
largeImageKey: "ezppfarm",
|
||||||
largeImageText: appInfo.appName + " " + appInfo.appVersion,
|
largeImageText: appInfo.appName + " " + appInfo.appVersion,
|
||||||
buttons: [
|
buttons: actionButtons,
|
||||||
{
|
|
||||||
label: "Download the Launcher",
|
|
||||||
url: "https://ez-pp.farm/download"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Join EZPPFarm",
|
|
||||||
url: "https://discord.com/invite/g8Bh7RaKPg"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
instance: false,
|
instance: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
const axios = require('axios').default;
|
const axios = require('axios').default;
|
||||||
|
|
||||||
const loginCheckEndpoint = 'https://new.ez-pp.farm/login/check';
|
const loginCheckEndpoint = 'https://ez-pp.farm/login/check';
|
||||||
|
|
||||||
const performLogin = async (username, password) => {
|
const performLogin = async (username, password) => {
|
||||||
const result = await axios.post(loginCheckEndpoint, { username, password });
|
const result = await axios.post(loginCheckEndpoint, { username, password });
|
||||||
|
@@ -64,9 +64,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="launch-button-section">
|
<div class="launch-button-section">
|
||||||
<button class="btn btn-lg btn-launch btn-accent" id="launch-btn">Launch</button>
|
<button class="btn btn-lg btn-launch btn-accent" id="launch-btn">Launch</button>
|
||||||
<div class="patch-checkbox">
|
<div class="patch-checkbox" style="display: none;">
|
||||||
<input type="checkbox" id="enablePatching" disabled/>
|
<input type="checkbox" id="enablePatching" disabled />
|
||||||
<label for="enablePatching" style="display: initial;">enable Patching</label>
|
<label for="enablePatching" style="display: initial;">enable
|
||||||
|
Patching</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -114,6 +115,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
<script type="text/javascript" src="../assets/mdb.min.js"></script>
|
<script type="text/javascript" src="../assets/mdb.min.js"></script>
|
||||||
|
|
||||||
</html>
|
</html>
|
@@ -8,6 +8,9 @@ const { EventEmitter } = require('events');
|
|||||||
const { DownloaderHelper } = require('node-downloader-helper');
|
const { DownloaderHelper } = require('node-downloader-helper');
|
||||||
|
|
||||||
const checkUpdateURL = "https://osu.ppy.sh/web/check-updates.php?action=check&stream=";
|
const checkUpdateURL = "https://osu.ppy.sh/web/check-updates.php?action=check&stream=";
|
||||||
|
const ignoredOsuEntities = [
|
||||||
|
'osu!auth.dll'
|
||||||
|
]
|
||||||
const osuEntities = [
|
const osuEntities = [
|
||||||
'avcodec-51.dll',
|
'avcodec-51.dll',
|
||||||
'avformat-52.dll',
|
'avformat-52.dll',
|
||||||
@@ -87,6 +90,8 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
|
|||||||
const fileHash = updatedFile.file_hash;
|
const fileHash = updatedFile.file_hash;
|
||||||
const fileURL = updatedFile.url_full;
|
const fileURL = updatedFile.url_full;
|
||||||
|
|
||||||
|
if (ignoredOsuEntities.includes(fileName)) continue;
|
||||||
|
|
||||||
const fileOnDisk = path.join(osuPath, fileName);
|
const fileOnDisk = path.join(osuPath, fileName);
|
||||||
if (await fu.existsAsync(fileOnDisk)) {
|
if (await fu.existsAsync(fileOnDisk)) {
|
||||||
const binaryFileContents = await fs.promises.readFile(fileOnDisk);
|
const binaryFileContents = await fs.promises.readFile(fileOnDisk);
|
||||||
@@ -96,14 +101,12 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
|
|||||||
fileName,
|
fileName,
|
||||||
fileURL
|
fileURL
|
||||||
})
|
})
|
||||||
//console.log("hashes are not matching", `(${existingFileMD5} - ${fileHash})`);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
filesToDownload.push({
|
filesToDownload.push({
|
||||||
fileName,
|
fileName,
|
||||||
fileURL
|
fileURL
|
||||||
});
|
});
|
||||||
//console.log("new file " + fileName);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return filesToDownload;
|
return filesToDownload;
|
||||||
|
16
package.json
16
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ezpplauncher",
|
"name": "ezpplauncher",
|
||||||
"version": "1.1.1",
|
"version": "1.1.2",
|
||||||
"main": "app.js",
|
"main": "app.js",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"author": "HorizonCode",
|
"author": "HorizonCode",
|
||||||
@@ -33,17 +33,15 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron .",
|
"start": "electron .",
|
||||||
"rebuild": "electron-rebuild -f -w get-window-by-name",
|
"rebuild": "electron-rebuild -f -w get-window-by-name",
|
||||||
"pack-win": "electron-builder --x64",
|
"pack-win": "electron-builder --win --arm64 --x64",
|
||||||
"pack-win32": "electron-builder --ia32",
|
"pack-linux": "electron-builder --linux --arm64 --x64",
|
||||||
"pack-winarm": "electron-builder --arm64",
|
"pack-mac": "electron-builder --mac --arm64 --x64",
|
||||||
"pack-linux": "electron-builder --dir --linux --ia32 --arm64 --x64",
|
|
||||||
"pack-mac": "electron-builder --dir --mac --ia32 --arm64 --x64",
|
|
||||||
"dist": "electron-builder"
|
"dist": "electron-builder"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^21.1.1",
|
"electron": "^24.2.0",
|
||||||
"electron-builder": "^23.0.3",
|
"electron-builder": "^23.6.0",
|
||||||
"electron-packager": "^15.5.1",
|
"electron-packager": "^17.1.1",
|
||||||
"electron-rebuild": "^3.2.9"
|
"electron-rebuild": "^3.2.9"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
Reference in New Issue
Block a user