Emulation/fpPS4-Temmie-s-Launcher
1
0
Fork 0
mirror of https://github.com/themitosan/fpPS4-Temmie-s-Launcher.git synced 2024-06-22 06:02:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Project: bump version to 1.2.4, Updater: fix launcher not being able to check for updates on first boot, Settings: Update default value for fpPS4 workflow, GUI: Updated general animations

Browse source
This commit is contained in:
themitosan 2024-02-15 15:20:06 -03:00
parent 180352a297
commit cd2464fa00
15 changed files with 64 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
App/css/style.css
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
fpPS4 Temmie's Launcher
Styles.css
styles.css
Main application stylesheet
******************************************************************************
@ -97,6 +97,7 @@ img {
position: absolute;
background-color: #162a50;
height: calc(100% - 202px);
transition-timing-function: cubic-bezier(0,1,0,1);
background-image: linear-gradient(146deg, #090f1b, #162a50);
}
.DIV_LOG {
@ -111,6 +112,7 @@ img {
background-position: center;
background-repeat: no-repeat;
background-image: url('../img/logo.png');
transition-timing-function: cubic-bezier(0,1,0,1);
}
.DIV_ACTIONS {
top: 0px;
@ -135,6 +137,7 @@ img {
transition: 0.1s;
position: absolute;
height: calc(100% - 150px);
transition-timing-function: cubic-bezier(0,1,0,1);
background-image: linear-gradient(0deg, #162a50, #2a4a86);
}
.DIV_GAME_OPTIONS {
@ -661,8 +664,8 @@ img {
min-width: 160px;
margin-left: 4px;
border-radius: 4px;
background-color: #000;
font-family: monospace;
background-color: #000;
padding: 6px 0px 6px 6px;
}

7
App/js/language.js
View file

@ -105,14 +105,15 @@ temp_LANGUAGE = {
"updateEmu-2-4": "Extracting update",
"updateEmu-3-4": "Removing leftover files",
"updateEmu-4-4": "Update complete!",
"settingsLogEmuSha": "INFO - fpPS4 version: (%VARIABLE_0%)",
"settingsLogEmuSha": "INFO - fpPS4 version: %VARIABLE_0%",
"dumpStatus_OK": "Fine",
"dumpStatus_WARN": "Missing files",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "ERROR - (Updater) Unable to locate selected CI workflow from fpPS4 GitHub!",
"updateEmuWorkflow404": "ERROR - (Updater) Unable to load workflow list from fpPS4 GitHub!",
"updater_noWorkflowListAvailable": "No workflow list available",
"Sdl2NotFound": "SDL2.dll is not found in the Emu folder, please install it to use SDL2.",
"errorListUnableLocateGamePath": "ERROR - Unable to locate \"%VARIABLE_0%\" settings path! In order to prevent issues, game list will be reloaded.\nPath: %VARIABLE_1%"
"errorListUnableLocateGamePath": "ERROR - Unable to locate \"%VARIABLE_0%\" settings path! In order to prevent issues, game list will be reloaded.\nPath: %VARIABLE_1%",
"updateEmuSettingsWorkflow404": "ERROR - (Updater) Unable to find (%VARIABLE_0%) on fpPS4 worflow list! %VARIABLE_1% will be used as fallback."
},
"title": {

6
App/js/settings.js
View file

@ -75,8 +75,8 @@ temp_SETTINGS = {
*/
latestCommitSha: '',
enableEmuUpdates: !0,
fpps4selectedCI: 'CI',
fpps4BranchName: 'trunk',
fpps4selectedCI: 'Main CI',
/*
Debug
@ -123,10 +123,8 @@ temp_SETTINGS = {
});
// Load settings
// Load settings and check if needs to update settings file
this.data = loadSettings;
// Check if need to update settings file
if (updateSettings === !0){
APP.log(APP.lang.getVariable('infoSettingsUpdated'));
APP.settings.save();

45
App/js/updateEmu.js
View file

@ -51,10 +51,8 @@ temp_EMU_UPDATE = {
// Process workflows
const processWorkflows = function(data){
// Variables
// Create variables and check if data was provided
var htmlTemp = `<option disabled>${APP.lang.getVariable('updater_noWorkflowListAvailable')}</option>`;
// Check if data is provided
if (data !== void 0){
// Reset html temp and process workflow list
@ -67,6 +65,7 @@ temp_EMU_UPDATE = {
// Append HTML
document.getElementById('SELECT_settingsUpdaterCurrentCI').innerHTML = htmlTemp;
document.getElementById('SELECT_settingsUpdaterCurrentCI').value = APP.settings.data.fpps4selectedCI;
}
@ -117,42 +116,40 @@ temp_EMU_UPDATE = {
// If Emu updates is available, has internet and fpPS4 isn't running
if (APP.settings.data.enableEmuUpdates === !0 && navigator.onLine === !0 && APP.emuManager.emuRunning === !1){
// Disable check for updates emu
// Disable check for updates emu and fetch workflow list
document.getElementById('BTN_UPDATE_FPPS4').disabled = 'disabled';
// Fetch worflow list
fetchData(workflowLink, function(data){
// Set json
// Set json and declare variables
options['wList'] = data;
// Variables
var sWorkflow,
wList = options.wList.workflows;
// Seek selected ci
for (var i = 0; i < wList.length; i++){
if (wList[i].name === APP.settings.data.fpps4selectedCI){
sWorkflow = i;
break;
// Check if workflow list has items
if (wList.length !== 0){
// Seek selected ci
for (var i = 0; i < wList.length; i++){
if (wList[i].name === APP.settings.data.fpps4selectedCI){
sWorkflow = i;
break;
}
}
}
// Get workflow runs
if (sWorkflow !== void 0){
// Check if workflow was found. If not, use first available!
if (sWorkflow === void 0){
sWorkflow = 0;
APP.log(APP.lang.getVariable('updateEmuSettingsWorkflow404', [APP.settings.data.fpps4selectedCI, wList[sWorkflow]]));
}
fetchData(`${workflowLink}/${wList[sWorkflow].id}/runs`, function(data){
options['runs'] = data;
APP.emuManager.update.processActions(options);
});
} else {
// If not found, log it
} else {
const errMsg = APP.lang.getVariable('updateEmuWorkflow404');
console.error(errMsg);
APP.log(errMsg);
}
});
@ -180,10 +177,8 @@ temp_EMU_UPDATE = {
// Seek for latest success run
for (var i = 0; i < options.runs.workflow_runs.length; i++){
// Get current run data
// Get current run data, check if status is completed (with a success build) and if is from same branch
const cRun = options.runs.workflow_runs[i];
// Check if status is completed (with a success build) and it is from same branch
if (cRun.status === 'completed' && cRun.conclusion === 'success' && cRun.head_branch === settingsData.fpps4BranchName){
// Set can update on

5
Lang/Ar-ar.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "جيد",
"dumpStatus_WARN": "ملفات مفقودة",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "خطأ - لا يمكن العثور على CI workflow من fpPS4 GitHub ",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "لم يتم العثور على قائمة workflow",
"Sdl2NotFound": "",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

5
Lang/fr-fr.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "Parfait",
"dumpStatus_WARN": "Fichiers manquants",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "ERREUR - (Mise à jour) N'a pas pu localiser une sélection CI dans la liste des flux de travail de GitHub !",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "Impossible d'obtenir la liste CI !",
"Sdl2NotFound": "Impossible de trouver SDL2.dll dans le dossier Emu, vérifiez s'il est là pour activer \"SDL\".",
"errorListUnableLocateGamePath": "ERREUR - Impossible de trouver le dossier de paramètres pour \"%VARIABLE_0%\" ! Pour éviter les erreurs, la liste des applications/jeux a été mise à jour.\nChemin : %VARIABLE_1%"
"errorListUnableLocateGamePath": "ERREUR - Impossible de trouver le dossier de paramètres pour \"%VARIABLE_0%\" ! Pour éviter les erreurs, la liste des applications/jeux a été mise à jour.\nChemin : %VARIABLE_1%",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

5
Lang/it-it.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "Perfetto",
"dumpStatus_WARN": "File mancanti",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "ERRORE - Impossibile trovare l'elemento di configurazione principale nell'elenco dei workflows di fpPS4 su GitHub!",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "Impossibile ottenere l'elenco CI!",
"Sdl2NotFound": "",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

3
Lang/ja-ja.json
View file

@ -64,7 +64,8 @@
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "",
"Sdl2NotFound": "",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

5
Lang/nl-nl.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "Prima",
"dumpStatus_WARN": "Missende bestanden",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "ERROR - (Updater) De geselecteerde CI workflow kon niet gevonden worden in de fpPS4 GitHub!",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "geen workflow lijst beschikbaar",
"Sdl2NotFound": "SDL2.dll is niet gevonden in de Emu map, installeer het om SDL2 te gebruiken.",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

9
Lang/pt-br.json
View file

@ -57,18 +57,19 @@
"updateEmu-2-4": "Extraíndo update",
"updateEmu-3-4": "Removendo arquivos de sobra",
"updateEmu-4-4": "Update concluído!",
"settingsLogEmuSha": "INFO - Versão do fpPS4: (%VARIABLE_0%)",
"settingsLogEmuSha": "INFO - Versão do fpPS4: %VARIABLE_0%",
"dumpStatus_OK": "Perfeito",
"dumpStatus_WARN": "Faltam arquivos",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "ERRO - (Updater) Não foi possivel localizar a CI selecionada na lista de workflows do GitHub!",
"updateEmuWorkflow404": "ERRO - (Updater) Não foi possivel obter a lista de workflows do projeto no GitHub!",
"updater_noWorkflowListAvailable": "Não foi possivel obter lista de CI!",
"Sdl2NotFound": "Não foi possível encontrar SDL2.dll na pasta Emu, verifique se o mesmo se encontra lá para habilitar \"SDL\".",
"errorListUnableLocateGamePath": "ERRO - Não foi possível localizar a pasta de configurações para \"%VARIABLE_0%\"! Para prevenir erros, a lista de Apps / Games foi atualizada.\nCaminho: %VARIABLE_1%"
"errorListUnableLocateGamePath": "ERRO - Não foi possível localizar a pasta de configurações para \"%VARIABLE_0%\"! Para prevenir erros, a lista de Apps / Games foi atualizada.\nCaminho: %VARIABLE_1%",
"updateEmuSettingsWorkflow404": "ERRO - (Updater) Não foi possível encontrar a worflow %VARIABLE_0%! A workflow %VARIABLE_1% será usada no lugar."
},
"input_text": {
"INPUT_gameListSearch": {"placeholder": "Pesquisa: Nome do game...", "value": ""}
"INPUT_gameListSearch": { "placeholder": "Pesquisa: Nome do game...", "value": "" }
},
"title": {

5
Lang/ru-ru.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "Отлично",
"dumpStatus_WARN": "Недостающие файлы",
"dumpStatus_HB": "",
"updateEmuWorkflow404": "ОШИБКА - (Обновления) Невозможно найти выбранный рабочий процесс на GitHub fpPS4!",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "Нет доступного списка рабочих процессов",
"Sdl2NotFound": "SDL2.dll не найден в папке Emu, пожалуйста установите его чтобы использовать SDL2.",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

5
Lang/tr-tr.json
View file

@ -59,10 +59,11 @@
"dumpStatus_OK": "Mükemmel",
"dumpStatus_WARN": "Eksik dosyalar",
"dumpStatus_HB": "Homebrew",
"updateEmuWorkflow404": "HATA - (Güncelleme) GitHub iş akışları listesinde bir CI seçimi bulunamadı!",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "CI listesi alınamadı!",
"Sdl2NotFound": "SDL2.dll, Emu klasöründe bulunamadı, \"SDL\"yi etkinleştirmek için orada olduğundan emin olun.",
"errorListUnableLocateGamePath": "HATA - \"%VARIABLE_0%\" için ayar klasörü bulunamadı! Hatalardan kaçınmak için uygulama/oyun listesi güncellendi.\nYol: %VARIABLE_1%"
"errorListUnableLocateGamePath": "HATA - \"%VARIABLE_0%\" için ayar klasörü bulunamadı! Hatalardan kaçınmak için uygulama/oyun listesi güncellendi.\nYol: %VARIABLE_1%",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {
"INPUT_gameListSearch": {

5
Lang/uk-ua.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "Добре",
"dumpStatus_WARN": "Недостатньо файлів",
"dumpStatus_HB": "",
"updateEmuWorkflow404": "ПОМИЛКА - (Оновлення) Неможливо знайти обраний робочий процес на GitHub fpPS4!",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "Немає доступного списку робочих процесів",
"Sdl2NotFound": "SDL2.dll не знайдено в папці Emu, будь ласка встановіть його щоб використовувати SDL2.",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

5
Lang/zh-s.json
View file

@ -61,10 +61,11 @@
"dumpStatus_OK": "完成",
"dumpStatus_WARN": "文件缺失",
"dumpStatus_HB": "自制",
"updateEmuWorkflow404": "ERROR - 无法在 fpPS4 GitHub 上找到当前选择的 CI Workflow",
"updateEmuWorkflow404": "",
"updater_noWorkflowListAvailable": "Workflow 列表无法读取",
"Sdl2NotFound": "模拟器文件夹中未发现 SDL2.dll , 请安装并使用 SDL2",
"errorListUnableLocateGamePath": ""
"errorListUnableLocateGamePath": "",
"updateEmuSettingsWorkflow404": ""
},
"input_text": {

4
package.json
View file

@ -1,5 +1,5 @@
{
"version": "1.2.3",
"version": "1.2.4",
"license": "GPL-2",
"author": "TheMitoSan",
"main": "App/index.htm",
@ -18,6 +18,6 @@
"position": "center",
"theme-color": "#000",
"icon": "App/img/logo.png",
"title": "fpPS4 Temmie's Launcher"
"title": "fpPS4 Temmie's Launcher - Please wait..."
}
}