Skip to content

Change Database class initialisation process #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barijaona merged 3 commits into from
Apr 19, 2026
Merged

Change Database class initialisation process #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4fecc5
Separate Database singleton initialiser from database setup code
Eitot Feb 16, 2026
a14e78e
Replace ‑initaliseFields method with lazily-initialised property
Eitot Feb 16, 2026
0697687
Add convenience initialiser to Field class for invisible fields
Eitot Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Vienna/Sources/Application/AppController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ - (void)installScriptsFolderWatcher {
-(void)applicationDidFinishLaunching:(NSNotification *)aNot
{
// Initialize the database
if ((db = [Database sharedManager]) == nil) {
db = Database.sharedManager;
if (!db || ![db loadDatabaseStore]) {
[NSApp terminate:nil];
return;
}
Expand Down Expand Up @@ -954,7 +955,7 @@ -(void)initSortMenu
NSMenu * sortSubmenu = [NSMenu new];

// Add the fields which are sortable to the menu.
for (Field * field in [db arrayOfFields]) {
for (Field *field in db.fields) {
if (field.customizationOptions & VNAFieldCustomizationSorting) {
NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:field.displayName
action:@selector(changeSortColumn:)
Expand Down Expand Up @@ -985,7 +986,7 @@ -(void)initSortMenu
-(void)initColumnsMenu
{
NSMenu * columnsSubMenu = [NSMenu new];
for (Field * field in [db arrayOfFields]) {
for (Field *field in db.fields) {
if (field.customizationOptions & VNAFieldCustomizationVisibility) {
NSMenuItem *menuItem =
[[NSMenuItem alloc] initWithTitle:field.displayName
Expand Down
19 changes: 17 additions & 2 deletions Vienna/Sources/Database/Database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ extern NSNotificationName const VNADatabaseDidDeleteFolderNotification;

@property (class, readonly, nonatomic) Database *sharedManager NS_SWIFT_NAME(shared);

/**
Loads the database store.

This method performs these operations in order:
1. Retrieve and create if necessary the database path.
2. Load the database queue and ask if necessary to relocate the database.
3. Perform a SQLite3 `quick_check` and alert if issues are found.
4. Depending on the database version:
- perform a database migration,
- alert that the database is too old or
- set up an initial database.
@return `YES` if the database is loaded and has the current version or `NO`
if any of the operations failed.
*/
- (BOOL)loadDatabaseStore;

@property(nonatomic) Folder * trashFolder;
@property(nonatomic) Folder * searchFolder;
@property (copy, nonatomic) NSString *searchString;
Expand All @@ -55,8 +71,7 @@ extern NSNotificationName const VNADatabaseDidDeleteFolderNotification;
-(void)close;

// Fields functions
-(void)addField:(NSString *)name type:(NSInteger)type sqlField:(NSString *)sqlField visible:(BOOL)visible width:(NSInteger)width;
-(NSArray *)arrayOfFields;
@property (readonly, nonatomic) NSArray<Field *> *fields;
-(Field *)fieldByName:(NSString *)name;

// Folder functions
Expand Down
Loading