From 61eb07cbfceb614ccb8b544216df46c732fe7c00 Mon Sep 17 00:00:00 2001 From: Ioan Lucut Date: Sat, 23 Sep 2023 22:51:15 +0300 Subject: [PATCH] Updates --- .run/[Local] Run converter.run.xml | 6 +- README.md | 8 + runner.ts | 7 +- src/converterService.ts | 2 +- src/gDriveConverterRunner.ts | 2 +- src/localConverterRunner.ts | 12 + win-debug/TEST_TEMPLATE_3.pro | Bin 0 -> 7190 bytes win-debug/TEST_TEMPLATE_3.txt | 769 +++++++++++++++++++++++++++++ 8 files changed, 800 insertions(+), 6 deletions(-) create mode 100644 win-debug/TEST_TEMPLATE_3.pro create mode 100644 win-debug/TEST_TEMPLATE_3.txt diff --git a/.run/[Local] Run converter.run.xml b/.run/[Local] Run converter.run.xml index 373750e..6b8eb38 100644 --- a/.run/[Local] Run converter.run.xml +++ b/.run/[Local] Run converter.run.xml @@ -1,5 +1,9 @@ - + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 51d9d3e..99f04e6 100644 --- a/README.md +++ b/README.md @@ -122,3 +122,11 @@ cd proto protoc --decode rv.data.Presentation ./presentation.proto < ~/Documents/ProPresenter/Libraries/Default/TEMP.pro > ../TEMP_decoded_from_propres7.txt ``` + +#### Decode a single win presentation file called `TEMP.pro` to `TS` + +```unix +cd proto + +protoc --decode rv.data.Presentation ./presentation.proto < ../win-debug/TEST_TEMPLATE_3.pro > ../win-debug/TEST_TEMPLATE_3.txt +``` diff --git a/runner.ts b/runner.ts index 5ba270c..6a75a3c 100644 --- a/runner.ts +++ b/runner.ts @@ -13,16 +13,17 @@ const CONFIG = { arrangementName: 'BES', ccliSettings: { publisher: 'Biserica Emanuel Sibiu', - author: 'Ioan LucuČ›', + author: 'Echipa Versuri', copyrightYear: new Date().getFullYear(), album: `Biserica Emanuel Sibiu ${new Date().getFullYear()}`, songNumber: 0, } as Presentation_CCLI, fontConfig: { - name: 'CMGSans-Regular', + name: 'CMGSans-BoldCnCAPS', size: 58, - family: 'CMGSans', bold: true, + family: 'CMG Sans Cn CAPS', + face: 'Bold', } as Graphics_Text_Attributes_Font, graphicSize: { width: 1920, diff --git a/src/converterService.ts b/src/converterService.ts index 1eb73b6..6cae53d 100644 --- a/src/converterService.ts +++ b/src/converterService.ts @@ -31,7 +31,7 @@ export const getConvertedAndWrittenToLocalOutDirSongs = ( const songInProPresenter7Format = convertSongToProPresenter7(song, config); const songFileName = fileName.replace(TXT_EXTENSION, PRO_EXTENSION); - const songFilePath = path.join(dir, fileName); + const songFilePath = path.join(dir, songFileName); fs.writeFileSync( songFilePath, diff --git a/src/gDriveConverterRunner.ts b/src/gDriveConverterRunner.ts index 71d98b9..5259cbf 100644 --- a/src/gDriveConverterRunner.ts +++ b/src/gDriveConverterRunner.ts @@ -117,7 +117,7 @@ export const convertSongsToPP7FormatRemotely = async ({ if (process.env.FORCE_RELEASE_OF_ALL_SONGS === 'true') { console.log( - `[Remote]: Force release of all songs from GH. Skip incremental deployments by doing a full deployment. Please proceed with applying the theme.`, + `[Remote]: Force release of all songs from GH. Skip incremental deployments by doing a full deployment. Please proceed with applying the theme.`, ); await uploadSongsAndManifestToGDrive( diff --git a/src/localConverterRunner.ts b/src/localConverterRunner.ts index bdf9c87..ab5df26 100644 --- a/src/localConverterRunner.ts +++ b/src/localConverterRunner.ts @@ -75,6 +75,18 @@ export const convertSongsToPP7FormatLocally = async ({ // Create directory fsExtra.ensureDirSync(deploymentVersionedDir); + if (process.env.FORCE_RELEASE_OF_ALL_SONGS === 'true') { + console.log(`Just debug.`); + + getConvertedAndWrittenToLocalOutDirSongs( + deployableSongs, + deploymentVersionedDir, + config, + ); + + return; + } + fs.writeFileSync(localManifestFilePath, JSON.stringify(currentManifest)); // --- diff --git a/win-debug/TEST_TEMPLATE_3.pro b/win-debug/TEST_TEMPLATE_3.pro new file mode 100644 index 0000000000000000000000000000000000000000..2e5eb62228e1ea9ff5d123ae70d7c097ab717498 GIT binary patch literal 7190 zcmeHM-ESR76~EVxev;O za2VdSkzsL)Tq-EC3|knOJCsn)e^^#zZb3htszdV;i!WD)9?oYt3#}X%6AN1=lGuhJ zY{Nv3kPJx%PRGRMuFy%lRqp-(3rtKMBgq4>oC+N|HdsWZjhPWxRHrU~xvXTlMg5qs z9$Z*yCRwXGKK9P_bG0Ksed(pI7RJpCR0eYcEmt_)(tYImu8xerA;{rEAfH+$vvpqw zKafr*xrGJ|gi8bPE!VAlLKfl{^AX{?kQPjm1bp?isocJPCNl$ixRX$xf8^DzBYoRU*LPcvqUpbu5WolLZcy0d{<=I;M^+M4^9KTa(k(5-vYB`kV5# z!|K*y<@HJBW<|L*oOeZp%@_|1&E^67}|WI zKKb70KcD&Ct@XO9j=Vp#Irr@wFV-igpla^jt@^Q2k#5y+dH%=cN?ARql+;qSq)sa% zBi%Z6TdZ!2>LV~nS7ov*z#v_*S61DnEFYk!pl*xR9pXTxyf`*H3bj`c{p!&_f9LzP zr3X80D)s82k8I&$Azk`PTj7mX{eiX}hw9T^VYa;!^!E3AH9j)=!t;50wYK`)P&HL- zMO`@m=rW62XucVVg?M4^!g6QC^YwapaRREfyk1*~wY+laK(4sEEo7`R(DUzViSKIg z%zg}>{o~+OFG&OJfeB&p^4A+WG09agXvS&EBM&NrIE=L0Cvtl8s^>SOW&&!by+jIP znqDK3GR_4aWfJneE1>nPCpXqvETq`($8R-cER)br8r*{ony0<;(_VktI5&0Hi^5i# zG9Jm^SMzC^B%zS)QZMs$Z=J2nK15X0aQ@+=N z@)m<9B1ZmR%c4|=Jd#X=aRYR*$34)^px0KKgqJ0hwRGLe9T5xM&eAI|;{Y0_N%OM2 z5{h)CP=^mNFmARoFtL?!=*Gw1O4wM5;7N(+bFzuc&cJ->vGS#1P5aB%FEou0cMv-% zX@g{W@d@=C%K3hGzWSwk=3j0k%`6t$nIMpU3L$Yv*?g2Gi-$UE`etpaJk8(u$u08_ zuh*1o73J>*#8BU{EP@HLY-|GVQx3r@fUs-2rX_rz_>QT5ZaIP^s-`?FQg&H{}O6=DJg9X zei#LQ`C5@`oft{FA$!NxJ(VA1@)NO3;P}F*0S7KPOL8V$#NmhxU`Hg?P4)T#<%9kg z&s-9+=={ao77cF4CO}|_OnC3Ov}YviD_{X~xBuFatKSH9G7I6L3}=76r8EZPMDG~__*uo2|6E?!?M%v$@1#=s(G7!c*Unc7M^(^9~@YVAq}7i3}YXd4Fx)6Q5#W^2(U2I#crD& z{Ao&kcS`x!eaf%zQ{GYw!*%IffrF84+ps@fk?&N;N7%v~=qn2#n%`pw`(_7!9j|^+ z{%_NR=gK=``K2zgdZgYH&uxp}+!no_xW#&6N%q98m7Z9Ndg4}dTYRb~)>}QXlTJJZd@)dE~yuk z$NN1^sSkCa?5%65eEa#`0PMtx6CWm9-7A+nkS*%!h7UK}$Rs{ThAA;}9N{378iB1- z+wzTjWb3vo$9rV!6OpYa%ZX4%&o)`Coy+{}?H8*@^8cvqxw>Z#&xfu2{+DTI)>xd$ fNLvnhm>vDw`1}`luhQUdkv>}