Skip to content

Commit

Permalink
Refactor parameters json + nodes.json
Browse files Browse the repository at this point in the history
  • Loading branch information
Franck ALARY committed Feb 13, 2024
1 parent 08bc855 commit 02b2584
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 48 deletions.
2 changes: 1 addition & 1 deletion public/MainEvents/Helpers/TelmiOS.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as fs from 'fs'

const
getPathTelmiOsParameters = (drive) => {
return path.join(drive, 'Saves/parameters.json')
return path.join(drive, 'Saves/.parameters')
},

readTelmiOSParameters = (usb) => {
Expand Down
13 changes: 7 additions & 6 deletions public/MainEvents/Processes/Import/ConvertFolderFS.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const
}
return {
action: actionNodeKey,
defaultIndex: transitionSelectedOptionIndex
index: transitionSelectedOptionIndex
}
},
decipherMedias = (srcMedias, dstMedias, index, length, onEnd) => {
Expand Down Expand Up @@ -60,7 +60,8 @@ function convertFolderFS (srcPath, storyName) {
renameImage = (name) => findNewName(name, '.png', imagesNewNames),
renameAudio = (name) => findNewName(name, '.mp3', audiosNewNames),

uuid = stringSlugify(path.basename(srcPath)),
tmpUuid = stringSlugify(path.basename(srcPath)),
uuid = tmpUuid.length > 48 ? tmpUuid.substring(0, 48) : tmpUuid,
title = storyName || uuid,
dstPath = getStoriesPath(uuid),
srcImagesPath = path.join(srcPath, 'rf'),
Expand Down Expand Up @@ -116,19 +117,19 @@ function convertFolderFS (srcPath, storyName) {
stages[stageNodeKey] = {
image: renameImage(ri[imageAssetIndexInRI]),
audio: renameAudio(si[soundAssetIndexInSI]),
okButton: varsToTransitionNode(
ok: varsToTransitionNode(
okTransitionActionNodeIndexInLI,
okTransitionNumberOfOptions,
okTransitionSelectedOptionIndex,
okActionNodeKey
),
homeButton: varsToTransitionNode(
home: varsToTransitionNode(
homeTransitionActionNodeIndexInLI,
homeTransitionNumberOfOptions,
homeTransitionSelectedOptionIndex,
homeActionNodeKey
),
controlSettings: {
control: {
wheel,
ok,
home,
Expand All @@ -142,7 +143,7 @@ function convertFolderFS (srcPath, storyName) {

const
firstStageNode = stages['s0'],
nodes = {startAction: firstStageNode.okButton, stages, actions},
nodes = {startAction: firstStageNode.ok, stages, actions},
metadata = {title, uuid, image: 'title.png'}

delete stages['s0']
Expand Down
8 changes: 4 additions & 4 deletions public/MainEvents/Processes/Import/ConvertFolderSTUdio.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function convertFolderSTUdio (srcPath, storyName) {
}
return {
action: renameAction(transition.actionNode),
defaultIndex: transition.optionIndex
index: transition.optionIndex
}
},

Expand All @@ -62,9 +62,9 @@ function convertFolderSTUdio (srcPath, storyName) {
[renameStage(node.uuid)]: {
image: renameImage(node.image),
audio: renameAudio(node.audio),
okButton: reformatTransition(node.okTransition),
homeButton: reformatTransition(node.homeTransition),
controlSettings: node.controlSettings,
ok: reformatTransition(node.okTransition),
home: reformatTransition(node.homeTransition),
control: node.controlSettings,
}
}),
{}
Expand Down
2 changes: 1 addition & 1 deletion src/App/Components/Form/Input/InputRange.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function InputRange ({label, type, id, unit, defaultValue, className, ...props},
return null
}
r.getValue = () => {
return parseInt(r.value, 10)
return parseFloat(r.value)
}
ref.current = r
}
Expand Down
2 changes: 1 addition & 1 deletion src/App/Components/Form/Input/InputText.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function InputText ({label, type, id, required, className, ...props}, ref) {
return null
}
r.getValue = () => {
return (r.type === 'number') ? parseInt(r.value, 10) : r.value
return (r.type === 'number') ? parseFloat(r.value) : r.value
}
ref.current = r
}
Expand Down
9 changes: 7 additions & 2 deletions src/App/Components/Modal/Templates/ModalTasksVisualizer/ModalTasksVisualizer.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@
background: $black20;
}

.taskTextes {
.taskTextes, .taskTextesCancellable {
padding: 0 15px;
flex: 0 1 100%;
flex: 0 0 395px;
width: 395px;
}
.taskTextesCancellable {
flex: 0 0 364px;
width: 364px;
}

.taskProgressDescription {
Expand Down
2 changes: 1 addition & 1 deletion src/App/Components/Modal/Templates/ModalTasksVisualizer/TaskProcessing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function TaskProcessing ({task, message, current, total, onCancelTask}) {

return <li className={styles.taskContainer}>
{onCancelTask && <ButtonIconXMark onClick={onCancelTask}/>}
<div className={styles.taskTextes}>
<div className={onCancelTask ? styles.taskTextesCancellable : styles.taskTextes}>
<h2 className={styles.taskTitle}>{getLocale(task)}</h2>
<ProgressBar className={styles.taskProgressBar} current={current} total={total}/>
<p className={styles.taskProgressDescription}>
Expand Down
2 changes: 1 addition & 1 deletion src/App/Modules/Synchronize/Music/ModalMusicFormUpdate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function ModalMusicFormUpdate ({music, onValidate, onClose}) {
(values) => {
onValidate({
...music,
track: parseInt(values[0], 10),
track: Math.round(values[0]),
title: values[1],
album: values[2],
artist: values[3],
Expand Down
38 changes: 19 additions & 19 deletions src/App/Modules/Synchronize/TelmiOS/ModalTelmiOSParamsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@ function ModalTelmiOSParamsForm ({parameters, onValidate, onClose}) {
(validation) => {
return <>
<ModalContent>
<InputRange label={getLocale('audio-level-startup')}
defaultValue={parameters.audioLevelStartup * 100}
<InputRange label={getLocale('audio-volume-startup')}
defaultValue={parameters.audioVolumeStartup * 100}
min={0}
max={100}
step={1}
unit="%"
ref={inputRef0}/>
<InputRange label={getLocale('audio-level-max')}
defaultValue={parameters.audioLevelMax * 100}
<InputRange label={getLocale('audio-volume-max')}
defaultValue={parameters.audioVolumeMax * 100}
min={0}
max={100}
step={1}
unit="%"
ref={inputRef1}/>
<InputRange label={getLocale('screen-luminosity-startup')}
defaultValue={parameters.screenLuminosityStartup * 100}
<InputRange label={getLocale('screen-brightness-startup')}
defaultValue={parameters.screenBrightnessStartup * 100}
min={0}
max={100}
step={1}
unit="%"
ref={inputRef2}/>
<InputRange label={getLocale('screen-luminosity-max')}
defaultValue={parameters.screenLuminosityMax * 100}
<InputRange label={getLocale('screen-brightness-max')}
defaultValue={parameters.screenBrightnessMax * 100}
min={0}
max={100}
step={1}
Expand All @@ -69,12 +69,12 @@ function ModalTelmiOSParamsForm ({parameters, onValidate, onClose}) {
unit="minutes"
required={true}
ref={inputRef5}/>
<InputRange label={getLocale('mp3player-inactivity-tracks')}
defaultValue={parameters.mp3PlayerInactivityTracks}
min={1}
max={15}
step={1}
unit={getLocale('musics')}
<InputRange label={getLocale('music-inactivity-time')}
defaultValue={parameters.musicInactivityTime / 3600}
min={0.1}
max={3}
step={0.1}
unit={getLocale('hours')}
required={true}
ref={inputRef6}/>
</ModalContent>
Expand All @@ -95,13 +95,13 @@ function ModalTelmiOSParamsForm ({parameters, onValidate, onClose}) {
(values) => {
onValidate({
...parameters,
audioLevelStartup: values[0] / 100,
audioLevelMax: values[1] / 100,
screenLuminosityStartup: values[2] / 100,
screenLuminosityMax: values[3] / 100,
audioVolumeStartup: values[0] / 100,
audioVolumeMax: values[1] / 100,
screenBrightnessStartup: values[2] / 100,
screenBrightnessMax: values[3] / 100,
screenOnInactivityTime: values[4] * 60,
screenOffInactivityTime: values[5] * 60,
mp3PlayerInactivityTracks: values[6]
musicInactivityTime: values[6] * 3600
})
onClose()
}
Expand Down
11 changes: 6 additions & 5 deletions src/Locales/en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const en = {
'title': 'Title',
'album': 'Album',
'artist': 'Artist',
'hours': 'Hours',
'save': 'Save',
'initialize': 'Initialize',
'synchronize': 'Synchronize',
Expand All @@ -35,13 +36,13 @@ const en = {
'drop-files': 'Drop you file',
'drag-drop-medias': 'To import your stories or music, drag and drop them here.',
'error-occurred': 'An error has occurred!',
'audio-level-startup': 'Audio level at startup',
'audio-level-max': 'Maximum audio level ',
'screen-luminosity-startup': 'Screen luminosity at startup',
'screen-luminosity-max': 'Maximum screen luminosity',
'audio-volume-startup': 'Audio volume at startup',
'audio-volume-max': 'Maximum audio volume ',
'screen-brightness-startup': 'Screen brightness at startup',
'screen-brightness-max': 'Maximum screen brightness',
'screen-on-inactivity-time': 'Inactivity time before shutdown (Screen on)',
'screen-off-inactivity-time': 'Inactivity time before shutdown (Screen off)',
'mp3player-inactivity-tracks': 'Number of music tracks before shutdown',
'music-inactivity-time': 'Inactivity time before shutdown (Listening music)',

'input-required': 'The field <strong>"{0}"</strong> is required.',
'input-url-invalid': 'The field <strong>"{0}"</strong> must be a valid URL.',
Expand Down
15 changes: 8 additions & 7 deletions src/Locales/fr.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const fr = {
'title': 'Titre',
'album': 'Album',
'artist': 'Artiste',
'hours': 'Heures',
'save': 'Enregistrer',
'initialize': 'Initialisation',
'synchronize': 'Synchroniser',
Expand All @@ -35,13 +36,13 @@ const fr = {
'drop-files': 'Déposez vos fichiers',
'drag-drop-medias': 'Pour importer vos histoires ou musiques, glissez/déposez les ici.',
'error-occurred': 'Une erreur est survenue !',
'audio-level-startup': 'Volume audio au démarrage',
'audio-level-max': 'Volume audio maximum',
'screen-luminosity-startup': 'Luminosité de l\'écran au démarrage',
'screen-luminosity-max': 'Luminosité de l\'écran maximum',
'screen-on-inactivity-time': 'Temps d\'inactivité avant extinction (écran allumé)',
'screen-off-inactivity-time': 'Temps d\'inactivité avant extinction (écran éteint)',
'mp3player-inactivity-tracks': 'Nombre de musiques avant extinction',
'audio-volume-startup': 'Volume audio au démarrage',
'audio-volume-max': 'Volume audio maximum',
'screen-brightness-startup': 'Luminosité de l\'écran au démarrage',
'screen-brightness-max': 'Luminosité de l\'écran maximum',
'screen-on-inactivity-time': 'Temps d\'inactivité avant extinction (Ecran allumé)',
'screen-off-inactivity-time': 'Temps d\'inactivité avant extinction (Ecran éteint)',
'music-inactivity-time': 'Temps d\'inactivité avant extinction (Ecoute de musique)',

'input-required': 'Le champ <strong>"{0}"</strong> est obligatoire.',
'input-url-invalid': 'Le champ <strong>"{0}"</strong> doit être une URL valide.',
Expand Down

0 comments on commit 02b2584

Please sign in to comment.