118118 *
119119 * @author S1mplector
120120 * @see ui, infrastructure and core submodules
121- * @version 0.1.0
121+ * @version 0.1.1
122122 */
123123public class JournalApp extends JFrame {
124124 /**
@@ -466,7 +466,6 @@ public void disableSimFeatures() {
466466 */
467467 private void loadOrChooseRootFolder () {
468468 configFile = new File (System .getProperty ("user.home" ), CONFIG_FILENAME );
469- File icloudExisting = AppDirectories .findExistingIcloudRoot ();
470469 File configRoot = null ;
471470
472471 String nativePath = main .infrastructure .ffi .NativeAccess .readConfig (configFile .getAbsolutePath ());
@@ -491,31 +490,18 @@ private void loadOrChooseRootFolder() {
491490 }
492491 }
493492
494- File local = AppDirectories .defaultLocalRoot ();
495- File docs = AppDirectories .defaultDocumentsRoot ();
496- File best = AppDirectories .chooseBestRoot (configRoot , icloudExisting , local , docs );
497- if (best != null ) {
493+ File icloudOnly = AppDirectories .resolveIcloudRoot (configRoot );
494+ if (icloudOnly != null ) {
498495 int configScore = AppDirectories .estimateDataScore (configRoot );
499- int icloudScore = AppDirectories .estimateDataScore (icloudExisting );
500- int localScore = AppDirectories .estimateDataScore (local );
501- int docsScore = AppDirectories .estimateDataScore (docs );
502- int bestScore = AppDirectories .estimateDataScore (best );
496+ int icloudScore = AppDirectories .estimateDataScore (icloudOnly );
503497 main .infrastructure .io .IoLog .info ("root-select" , "config=" + pathOrNull (configRoot ) +
504- " score=" + configScore + ", icloud=" + pathOrNull (icloudExisting ) +
505- " score=" + icloudScore + ", local=" + pathOrNull (local ) +
506- " score=" + localScore + ", docs=" + pathOrNull (docs ) +
507- " score=" + docsScore + ", selected=" + best .getAbsolutePath () +
508- " score=" + bestScore );
509- if (configRoot != null && !configRoot .equals (best )) {
510- main .infrastructure .io .IoLog .warn ("root-select" , "Config root seems empty; switching to " +
511- best .getAbsolutePath (), null );
512- configureRootFolder (best , true );
513- } else {
514- configureRootFolder (best , configRoot == null );
515- }
516- if (configRoot != null && configRoot .equals (best )) {
517- maybePromptIcloudSwitch (icloudExisting );
498+ " score=" + configScore + ", icloud=" + pathOrNull (icloudOnly ) +
499+ " score=" + icloudScore + ", selected=iCloud" );
500+ if (configRoot != null && !AppDirectories .isIcloudRoot (configRoot )) {
501+ main .infrastructure .io .IoLog .warn ("root-select" , "Config root not in iCloud; switching to " +
502+ icloudOnly .getAbsolutePath (), null );
518503 }
504+ configureRootFolder (icloudOnly , !icloudOnly .equals (configRoot ));
519505 return ;
520506 }
521507
0 commit comments