From 373fde0d6fde66d27ef344d3ea45134d4c957c9d Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 28 Dec 2020 19:05:38 +0100 Subject: [PATCH] Migrate application data (config, logs, backups) directory from '$USER_HOME/.diylc' to '$USER_HOME/diylc' to avoid it being hidden on some OSs --- diylc/diylc-core/lib/app-framework.jar | Bin 53499 -> 53494 bytes .../src/org/diylc/presenter/update.xml | 4 +++ diylc/diylc-library/lib/app-framework.jar | Bin 53499 -> 53494 bytes diylc/diylc-library/lib/diylc-core.jar | Bin 340844 -> 340906 bytes diylc/diylc-swing/build.xml | 2 +- diylc/diylc-swing/lib/app-framework.jar | Bin 53499 -> 53494 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 340844 -> 340906 bytes diylc/diylc-swing/library/main.jar | Bin 750286 -> 750286 bytes .../src/org/diylc/DIYLCStarter.java | 31 +++++++++++++++--- .../src/org/diylc/log4j.properties | 2 +- .../swing/plugins/help/HelpMenuPlugin.java | 2 +- 11 files changed, 33 insertions(+), 8 deletions(-) diff --git a/diylc/diylc-core/lib/app-framework.jar b/diylc/diylc-core/lib/app-framework.jar index 8b1974e908be455b55497572bb120bcf32484f97..e8515ab128126bb3fe196f4cf0ecb5e7e02be655 100644 GIT binary patch delta 6054 zcmY*dcRbtQ_l_M=)NIA3_O4BoTB#YUR@JUjdlW%M?b?LcdlWURs2U|f&7$_6{fJg6 zMXAxBMnB)z@ALlWIrll|Jont2`^q2BX(7Q;ApyCb76Bm$00062U8tO7a$bVYOOT1f z!3S0xY;pYoBo*Fmg3B7DEIu#tIyDL7e>(L6|LV@>bsO`31$!i05qh?WQtqJB+T`OH~2+_e|Bv!Bf${h0#-8nt00oX>MFoeN#fyB zY&1Q88T!Vnpa2Xf__IX=6ASDraAT*%$1xF{x2}RJu4`98D-RP1E;T0{L5>^ff|gFJ zA>k!R5^rdhn?J3>@!y)OT@tWsB4Rfb74AMI!odHn=DPNpZD)_ezOz z0W0j33>PpzP`}#7!FB?Oli3y&$IHHy2;u?&1pg=F?#zk+hUbKWMVY|LA=cDM9z<>2 z*&46y8)zIJlNU^yJ1GQK@;;d?a;=<l7<}en#VA6xfX*Tm#RY0UV*Zteja6Ep1T3(1WNsnF8OlGQ(*PD2^ml?sSZX9Pq+37n6oajY%+4@bmfLPx0)BY)$NfA+QOy-_on%qy}G6G#jJ zn>0*`3zQzyew$sdWq@w&Va5I||A-0v`M@UOvBez(3{u%$7y%LijoJplR&rTao>)R6 z)4v<+nU;Mg!mC^*yI({4-K*w4JYwJ}zIUmAl>xlbf0|6$x%a!;LV<@}2sq+E{;h_R zb41ZsqYl%cDoPJ=_v@qTY0@u>vm?}+fZOz*!LLl`xmnW7gDTMJd_nLK;Ts3S>jK>> zlpX?zD543}AaQdn6dEEgTlD=1@YHMiW`bAqfLNLi-Vu;O-l)l|ORA<$$o^h=Q0YKB z|E>`{eW3Mzhvw&3_b;LcrbXf4sTy05WQH-cbg4K>K7OEl)^q1*fViO;Q%5geQH`2q zl&+E)?{+1hKNL6|C};Uv?$T6!uZjQ|jCqX!uQO|RxwP6j51TGb*&T5!WQiJe(37B4 zZK(noGH#5_cW+cn&R;9rBTvp4OU1fLR*?rdPh3A3s$*F!c|f)IO*r7&N1!Snin>|N zR}GWY`f~A8YrN(7m&)ygZVahBb-aliE$m)FhJw1w`Y+*K8KeTXqZu%=Fm%jqx@&X@6PRX%2F6T?&x~7e z(&g)Fje0w@i2ZYt1*psNxr8h44jFX#X7o`1#3R?QzML*1dD32_ngF;%uX_7>LbNc@ zK~sT{4=gEn;HV?x(!HK}kEzQ_!DSS|B39&@^!SN`wyAm`t%ZO|jE)Vk;i>%h;lldW zm`G5V543C${o{H{CZ9C*GSiF3uC?28O}9U1C~w_s)2AdG{2<-SAZFt=>V@9p7KkEX_j=Njpx5XU!b)>wanUoU7vXepF@|>V$_(G4vh zM$}G#?~zlbsI)xM4Mm5Uv_45|{xkiETEk;Ikk!bW9Yy0Hqr3YnKhsdN?Hso3Ioi%Q z#)Hzex>bSd@#C*6rMbfZ@Y3BSL_EyKe5T4Z>C4+fRsElt#^i3J;D9%{!ssas~ z$E9pNXS_`#DY@j{bSHR|*Oxh*Yx14J&2;k;_`Dto%4!sH%zUwJ8bxRla~KOuzm@0c z+WSUWhB=8#E1h= z)hn0b#cXU8VuaD+UOquZPTmQycD2v;86JL#JoWrqoB4IA_GGDKy9-^;Ph(ESG4l@9 zvy0X8pTu+T=ddGGZn-`FStuP-Eir!Aek_DKxm*xdNJWw^|DZEVX1kyc#C^NutH*^c z&nqDEx;o?7mNB*|FWC?@hj_(Et%cTa_9n@Cbk{S7B`LQ_IcdU?@)^?;;9LB%SEe@I ztu77Fb;e_L(|)Hik10`}+fEFhi!Il)j~!mVZY8wH$|P4^eIU`1rdYA}@_4*X31umm zg=kaWNJHn39XA|s+bi+#na@}4Z5~U_NVxc#C}GO=ZB&Oqg?hy-DhTJgNDpnep=T=+ z-RvAhva5ENxrc|h+?ZpEK0dFZ0JyG1RB-$5v)o5>4l{8zQ}s@!YT)I5Kc}|D-Kk@i z4wGVM)xn>KzUt^)+s{8h%P;rN&qB~vqyCDD<=<8C&tuUO%}>s_cE*nf&qNK!DgxSi z6M>udYmZ!ifDsX_lZa!ni%N8&b5KbB=rP+f%i_Sj6`m8mArPmNDKnNxOg?O2I^0pC zgYi+3bm*?i0%hF;39rQMwLDXNm=%Od+-3{|Rvd;(1V`piV)^7kGhIZzOup{v+Q09G zp2$YLui2A6&UO?5E5fet5fvgF2qhhZv_+3x7wTRIC8Iw`B7&2x(7d+^DkASSN(5(~ zN(M(*_1HE7I!ebL97w%G_15k+8*VK8su>eFsO(+F6MvU=C)D1F;%oiQg@>tbw3FXI z`<=K&SWO=Xo<*wf)&ZMAW=4|1vFYZyRl&OD&F@E#)8AOFTa5)rAgcG=kDD_F)KQ9e zSNuS~E!P#lhlyHKti#9hwXG^0(w9UX3$;kh~y!AI33j zleKc6Wk+>hSype(rrXz$kRbA@7PML{fI}fS;2IHc^B^Mb+r68p7dZwPhpIum^TlMT zakLB=`^k?nHy~XY6#L0_CqcEiK=kEDe9L6Fd39-gYE0ama94qa6>%cL{l&R#_tenIn<98;D z=ruTkr*&JGhv!xbF-JJ{r<@HsNB}BfSkJj5b6dQ1N+gm7rgDb(<&6x zP0(Q$D%fjA7 za8XJ12c#dGDAM(OtS*h{F=LW9U4bM$JnOUVmfO(bTc~&-+0+;M3*Lz3=rMDST@gBP z44o#H|7T)NJDsvM4wNrdD*U6YFVa(`*5l@(sO|TfiAdUJeQ;lKb1!pp5(j93fW%dE zwRBgvGaBm4$a$7pBk}p=@qM?qu3qcvh{S{fIszTxZWz4OrF(>nO?=M%jYOEQo-h^M zu`)v!Plsw6cyht}5UR~ekfSnf$YQ-P`u&X1n19cq?HN~8bbb=A^vYIxERhdqURIcr z^w_Zf<|iQ^fjWk;iw)SRiU%1XR4_gNhhOQ%1n-l*bsX%@NU0ajD%s@8wSRoIH>4H}s;|mkd#k|9Hdh zk=-9VsY^4Nb63zoHvo?^??y-<=~o`AZ35N>E6Zkm*oO-Pvb2cl3{(Hn57oqa8>u%N z$|~s69mp~L2<+S)ojvf&f)V)C9Q54QJFxqPJmC8tltVxEa@B%p^Bq<^1OX{HV|qrf zM{&$VFgzdba*U9lir(=!-x{4E!|GNI@jOab_Isv8_T9*Fc^eN51pzh& zOs*CenF;$<)qW|MT1IN^E+`b4r^O4D$wzT4q_YR2FkFqI z=OF7To0lw`U?o>_*WN&ZhpOq;wRHaTPSrjGPh_l_{1>1C`47@4d0~an7M;Qm#@2KiTY;?jpFf#UvFfI{MMb!5OL#-<1P7G>sujldGgG0G)5swZ}qkzo(3$NdErnpU3YmQ7LsvD zjR$Cv znDF8m!@A&UD)Tt6mXdmjT8`S=8d}+!NoIqpX%JnLsJ5sr{IX~Eq(HCW+$Sk-Ag1#$ zfy!s>%bs(z`$S)@Lrxv33eu=6fhUlU`<1u8yb>`@e6&laVQ%xLOi@@@%Y+Do565ZtUbS3xtQm1f7upqg7=o@#ur`M=7(>d z`yyYk@Vr}S#CkS&(FcxA8)Q17?~GUvC(=B?nkn5WY<)wk!OM4A7!wMo?YT{o;}-I| z$UnyNg!~tGNeia2DeMr!_IQ_Qdy%iT@~28x&8V0e6CyF6jk)twLJax~O?h@>i))%u z1jAT6`l?16wJs!gc*y5o&|5tZeG%s4S(#hyH)rNuS?t>Rp|@@dD;MVLTqw5o3DoZy=@(ALa z5O+RRp5p^g^21`iN0(^&=+VoP``_LM$u2;#M*Q!lt{uEO!NSPKo}vl_CW{y)izZzP zqP7eI!UM2kqy9{@egImQ4}x$2%?8bu-u3hS)7#_pYo{a!Do(?USm>uG_?kqWjc$M; zDEwUPoKRis5b{`r4$!l49`cXYhu;T;2q8o4V}kODr3ncRlp5z*3%}i6qFgI``vsBJ z6sxh?MSp)S3LVu4nt2?>w1`taw$3|4<^DoM3ls&5W^R6{`SjAd`Ck>q1KG+cRvnxZ zvj#E>%h`!f=o#XQ@Xeg_3j53D=|&w$eIAC*rM#xGFIXORFV$%p-36>#s!QHHL>#Gn z0hO$>0^lAsNf*34QIh4+2>cE2z%*&oK_1?|#-hZt%!@VcwLWpm3o6OCg;OhL=B8d5 zP2vg0bW2dRo%H5!c;E-%ZRP7l93+}y`gmz5T9&dMCKjs(J98bZbn2Y=G9Er~3F9huR zJdZAReEU4nt9TI?*^f__p&GtSCyFa)@3*?$eB}45jFdB9i$zfwBxajYY=H9NX>iVU ze(~4~SZ}H3?|aK(!f8}mMl=g!uqmXEr)7<|e6-y!%DG{o4(pNfwT>UC&s-(u5ZpDL*S1#Pg)@fWV zvb<9U=Vq>VD&ml{9+S0CJ*B1BYyAZ5+CzwQ$&uhT@O}bCoy5nBn?r zF$Op!>^8@tP4^Yw-fecME;UIn}cF$ zLKa@877{O0{7CFD6HYcR(JDOi(kmVz1ps9JBRiIgE7bkSgp+ms$cW#WiCoPT`QJ!% zsuA~(F5jHarFF~ypI*ko%U&?@_eU07FWU$szFFyC>Kd}36ohmgxw?d)%hZE%Txz+J z2H878i|bgtq)RIQ(hNwU(W`36C?kGL<6oK>dEQEb3>l?n{d4^x*9wet`8e~mmv(EtDd delta 6081 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 X(D#=#N`=|p`2V#S?_{?9o%sI%zrQ_G diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 2a5d30d1..faaaecc2 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3394,6 +3394,10 @@ 2020-12-20 00:00:00.000 CET + + IMPROVEMENT + Migrate application data (config, logs, backups) directory from '$USER_HOME/.diylc' to '$USER_HOME/diylc' to avoid it being hidden on some OSs + BUG_FIX macOS: splash screen hangs for several minutes on some machines diff --git a/diylc/diylc-library/lib/app-framework.jar b/diylc/diylc-library/lib/app-framework.jar index 8b1974e908be455b55497572bb120bcf32484f97..e8515ab128126bb3fe196f4cf0ecb5e7e02be655 100644 GIT binary patch delta 6054 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 delta 6081 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 X(D#=#N`=|p`2V#S?_{?9o%sI%zrQ_G diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index ac1719668e995e84248b41cb933823ce55df3549..a19535436f50448239c247d45373684b1c019436 100644 GIT binary patch delta 6757 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 delta 6738 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 n&D18MxAjqcRQZ=R? - + diff --git a/diylc/diylc-swing/lib/app-framework.jar b/diylc/diylc-swing/lib/app-framework.jar index 8b1974e908be455b55497572bb120bcf32484f97..e8515ab128126bb3fe196f4cf0ecb5e7e02be655 100644 GIT binary patch delta 6054 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 delta 6081 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 X(D#=#N`=|p`2V#S?_{?9o%sI%zrQ_G diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index ac1719668e995e84248b41cb933823ce55df3549..a19535436f50448239c247d45373684b1c019436 100644 GIT binary patch delta 6757 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 delta 6738 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 n&D18MxAjqcRQZ=R?H8RFb_M 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 delta 7424 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 XqA`62Ub&yoz#H3lCVEYuX^i_{CVo4l diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java index 6f64725c..6e087b3f 100644 --- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java +++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java @@ -18,8 +18,13 @@ package org.diylc; import java.io.File; +import java.io.IOException; import java.lang.reflect.Field; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Properties; @@ -97,11 +102,7 @@ public class DIYLCStarter { LOG.error("Could not initialize log4j configuration", e); } - // initialize configuration - ConfigurationManager configurationManager = ConfigurationManager.getInstance(); - XStream xStream = configurationManager.getSerializer(); - ProjectFileManager.configure(xStream); - configurationManager.initialize("diylc"); + initializeConfiguration(); // disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false); @@ -239,4 +240,24 @@ public class DIYLCStarter { + "Replace the main 'config.xml' file with the backup when running the latest version of DIYLC." + "", "Warning", IView.WARNING_MESSAGE); } + + private static void initializeConfiguration() { + // migrate config file from old folder path to the new one + Path oldPath = Paths.get(Utils.getUserDataDirectory(".diylc") + "config.xml"); + Path newPath = Paths.get(Utils.getUserDataDirectory("diylc") + "config.xml"); + try { + if (oldPath.toFile().exists() && !newPath.toFile().exists()) { + LOG.info("Copying config file to the new directory"); + Files.copy(oldPath, newPath, StandardCopyOption.REPLACE_EXISTING); + } + } catch (IOException e) { + LOG.error("Failed to copy config file to the new directory", e); + } + + // initialize + ConfigurationManager configurationManager = ConfigurationManager.getInstance(); + XStream xStream = configurationManager.getSerializer(); + ProjectFileManager.configure(xStream); + configurationManager.initialize("diylc"); + } } diff --git a/diylc/diylc-swing/src/org/diylc/log4j.properties b/diylc/diylc-swing/src/org/diylc/log4j.properties index d41504c8..6c3d5eea 100644 --- a/diylc/diylc-swing/src/org/diylc/log4j.properties +++ b/diylc/diylc-swing/src/org/diylc/log4j.properties @@ -2,7 +2,7 @@ log4j.rootLogger = DEBUG, fileout, stdout log4j.appender.fileout = org.diylc.appframework.miscutils.NewLogForEachRunFileAppender log4j.appender.fileout.layout.ConversionPattern = %d{ABSOLUTE} %5p [%t] %c{1} - %m%n log4j.appender.fileout.layout = org.apache.log4j.PatternLayout -log4j.appender.fileout.File = ${user.home}/.diylc/logs/log.txt +log4j.appender.fileout.File = ${user.home}/diylc/logs/log.txt log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout.ConversionPattern = %d{ABSOLUTE} %5p [%t] %c{1} - %m%n diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java index 1423c61b..f46e4504 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java @@ -77,7 +77,7 @@ public class HelpMenuPlugin implements IPlugIn { HELP_TITLE); swingUI.injectMenuAction(new NavigateURLAction("Plugin API", IconLoader.ApplicationEdit.getIcon(), PLUGIN_URL), HELP_TITLE); swingUI.injectMenuAction(new NavigateURLAction("Submit a Bug", IconLoader.Bug.getIcon(), BUG_URL), HELP_TITLE); - swingUI.injectMenuAction(new NavigateFolderAction("Access User Files", IconLoader.User.getIcon(), System.getProperty("user.home") + "/.diylc"), HELP_TITLE); + swingUI.injectMenuAction(new NavigateFolderAction("Access User Files", IconLoader.User.getIcon(), Utils.getUserDataDirectory("diylc")), HELP_TITLE); swingUI.injectMenuAction(null, HELP_TITLE); swingUI.injectMenuAction(new RecentUpdatesAction(), HELP_TITLE); swingUI.injectMenuAction(null, HELP_TITLE);