Ignore:
Timestamp:
04/26/19 17:36:43 (5 years ago)
Author:
bln4
Message:

A cleaner more methodical way of establishing what the paths are based on two factors: new vs old regime and authenticated vs not. This was motivated by a bug David found in starting a fresh version of Expeditee without -Dexpeditee.authentication. This fixes that bug.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/expeditee/settings/UserSettings.java

    r1287 r1328  
    239239                return expeditee_home;
    240240        }
    241 
     241       
    242242        public static void appendDefaultFolders() {
    243                 if (PublicAndPrivateResources && AuthenticatorBrowser.isAuthenticated()) {
    244                         // The comments here explain how things have changed with the new regime.
    245                         // FrameDirs
    246                         // 1. PROFILE_PATH                                      Still points to same place.
    247                         // 2. SHARED_FRAMESETS_PATH                     Still points to same place. (encryption stops just anyone reading it)
    248                         // 3. framesets-<username>                      Generated on user account creation and must be refreshed on user switching.  Also gives access to tutorial stuffs.
    249                         // 4. FRAME_PATH                                        <expeditee-home>\resources-public\framesets.
    250                         // 5. HELP_PUBLIC_PATH                          <expeditee-home>\resources-public\documentation.
    251                         // 6. MESSAGES_PATH                                     Still points to same place.  Should these be per user and encrypted?
    252                         // 7. PUBLIC_PATH                                       Still points to same place.  Kept for compatibility.
    253                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
     243                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
     244                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.TRASH_PATH);
     245                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
     246               
     247                if (PublicAndPrivateResources) {
     248                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
     249                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PRIVATE_PATH);
     250                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
    254251                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PRIVATE_PATH);
    255                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
    256                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
    257                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.RESOURCES_PATH);
    258252                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
    259                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
    260                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PRIVATE_PATH);
    261                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
     253                        if (AuthenticatorBrowser.isAuthenticated()) {
     254                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
     255                        }
    262256                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
    263                                                
    264                         // ImageDirs
    265                         // 1. resources-<username>\images       Generated on user account creation and must be refreshed on user switching.
    266                         // 2. IMAGES_PATH                                       <expeditee-home>\resources-public\images
     257                       
     258                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
    267259                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PRIVATE_PATH);
    268                         FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
    269260                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
    270261                       
     262                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
    271263                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PRIVATE_PATH);
    272                         FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
    273264                        FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
    274265                } else {
     266                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
    275267                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
    276                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
    277                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
    278                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
    279268                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
     269                        if (AuthenticatorBrowser.isAuthenticated()) {
     270                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
     271                        }
    280272                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
    281 
     273                       
    282274                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
    283275                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
    … …  
    287279                }
    288280        }
     281
     282//      public static void appendDefaultFolders() {
     283//              if (PublicAndPrivateResources && AuthenticatorBrowser.isAuthenticated()) {
     284//                      // The comments here explain how things have changed with the new regime.
     285//                      // FrameDirs
     286//                      // 1. PROFILE_PATH                                      Still points to same place.
     287//                      // 2. SHARED_FRAMESETS_PATH                     Still points to same place. (encryption stops just anyone reading it)
     288//                      // 3. framesets-<username>                      Generated on user account creation and must be refreshed on user switching.  Also gives access to tutorial stuffs.
     289//                      // 4. FRAME_PATH                                        <expeditee-home>\resources-public\framesets.
     290//                      // 5. HELP_PUBLIC_PATH                          <expeditee-home>\resources-public\documentation.
     291//                      // 6. MESSAGES_PATH                                     Still points to same place.  Should these be per user and encrypted?
     292//                      // 7. PUBLIC_PATH                                       Still points to same place.  Kept for compatibility.
     293//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
     294//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PRIVATE_PATH);
     295//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
     296//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
     297//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.RESOURCES_PATH);
     298//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
     299//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
     300//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PRIVATE_PATH);
     301//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
     302//                      FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
     303//                                             
     304//                      // ImageDirs
     305//                      // 1. resources-<username>\images       Generated on user account creation and must be refreshed on user switching.
     306//                      // 2. IMAGES_PATH                                       <expeditee-home>\resources-public\images
     307//                      FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PRIVATE_PATH);
     308//                      FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
     309//                      FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
     310//                     
     311//                      FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PRIVATE_PATH);
     312//                      FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
     313//                      FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
     314//              } else {
     315//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
     316//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
     317//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
     318//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
     319//                      FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
     320//                      if (FrameIO.FRAME_PRIVATE_PATH != null) {
     321//                              FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PRIVATE_PATH);
     322//                      }
     323//                      FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
     324//                     
     325//                      FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
     326//                      FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
     327//                     
     328//                      FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
     329//                      FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
     330//              }
     331//      }
    289332
    290333        /**
Note: See TracChangeset for help on using the changeset viewer.