chore(release): 2.1

.github/workflows/release.yml

@@ -17,6 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install GitHub CLI
+        run: sudo apt-get update && sudo apt-get install -y gh
+
+
       - name: Configure git
         run: |
           git config user.name "github-actions[bot]"
@@ -26,7 +30,7 @@ jobs:
 
       - name: Create release branch
         run: |
-          git checkout -B release/${{ inputs.version }}
+          git checkout -B release/v${{ inputs.version }}
 
       - name: Set version in flake.nix
         run: |
@@ -42,14 +46,14 @@ jobs:
 
       - name: Push branch
         run: |
-          git push origin release/${{ inputs.version }}
+          git push origin release/v${{ inputs.version }}
 
       - name: Create Pull Request
         run: |
           gh pr create \
             --base main \
-            --head release/${{ inputs.version }} \
+            --head release/v${{ inputs.version }} \
-            --title "[Automatic] Release PR ${{ inputs.version }}" \
+            --title "[Automatic] Release v${{ inputs.version }}" \
-            --body "Automated release PR.\nAfter the test's succesfull run, create manually a release with a new tag matching ${{ inputs.version }}"
+            --body "Automated release PR.\nAfter the test's succesfull run, create manually a release with a new tag matching `${{ inputs.version }}`"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -57,26 +57,6 @@ You must also have a [supported editor (and their associated plugin if needed)](
 
 ## How to install
 
-### Nix flakes
-
-Add this to your inputs in flake.nix:
-
-```nix
-notewrapper = {
-  url = "github:tomasriveral/notewrapper";
-};
-```
-If your flake already inputs nixpkgs and/or flake-utils, you can follow it:
-```nix
-notewrapper = {
-  url = "github:tomasriveral/notewrapper;
-  inputs.nixpkgs.follow = "nixpkgs";
-  inputs.flake-utils.follow = "flake-utils";
-};
-```
-
-### Building from source
-
 1. Install all required dependencies listed above.
 2. Ensure you have a supported editor installed.
 3. Clone the repository:
@@ -109,7 +89,7 @@ make
 
 ---
 
-### Packaging
+## Packaging
 
 There is currently no official package available for NoteWrapper.
 

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779560665,
+        "lastModified": 1779508470,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "29916453413845e54a65b8a1cf996842300cd299",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,16 +6,21 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils}:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
       in {
         packages.default = pkgs.stdenv.mkDerivation (finalAttrs: {
           pname = "notewrapper";
-          version = "v2.2";
+          version = "2.1";
 
-          src = ./.;
+          src = pkgs.fetchFromGitHub {
+            owner = "tomasriveral";
+            repo = "NoteWrapper";
+            tag = "v${finalAttrs.version}";
+            hash = "sha256-JoI38n5RZ/s0n+Vr9Bri2oiFeyj7Xrt1AmglmcuMpmQ=";
+          };
 
           nativeBuildInputs = with pkgs; [
             pkg-config
@@ -32,8 +37,12 @@
             gnused
           ];
 
+          makeFlags = [
+            "VERSION=2.0"
+          ];
+
           buildPhase = ''
-            make VERSION=${finalAttrs.version}
+            make
           '';
 
           installPhase = ''

src/main.c

@@ -529,14 +529,9 @@ backup_config_end:
                   shouldDebug); // check if editor is supported and if it is installed. If not, it
                                 // will throw an error.
 
-    int *backupMessage = malloc(sizeof(int)); // Used later to set the backuping message.
-    *backupMessage = 0;                       // default don't show the message
-    int forceBackup = 0;
     if (doesBackup) {
-        debug("Handling normal backup");
+        debug("Handling backup");
-        forceBackup = 0;
+        handleBackups(directoriesArray, numDirectories, backupDirectoriesArray, homedir, interval, (const char **)rsyncArgs, rsyncArgsNumber, shouldDebug);
-        handleBackups(directoriesArray, numDirectories, backupDirectoriesArray, homedir, interval, (const char **)rsyncArgs, rsyncArgsNumber, forceBackup, backupMessage, shouldDebug);
-        debug("backupMessage was set to %d by a normal backup", *backupMessage);
     }
 
     initscr(); // initialize ncurses
@@ -577,26 +572,13 @@ backup_config_end:
             }
             altDebug("└ ------------------------------\n");
         }
-        int extraOptions = 3;
-        if (doesBackup) {
-            extraOptions++; // space for "Backup now" button
-        }
-        if (*backupMessage) {
-            extraOptions++;
-        }
-        vaultsArray = realloc(vaultsArray, (vaultsCount + extraOptions) * sizeof(char *)); // resize vaultsArray to fit the extra options
-        int index = 0;
-        vaultsArray[vaultsCount + index++] = "Create a new vault"; // some more options that are not vaults
-        vaultsArray[vaultsCount + index++] = "Settings";
-        if (doesBackup) {
-            vaultsArray[vaultsCount + index++] = "Backup now";
-        }
-        vaultsArray[vaultsCount + index++] = "Quit (Ctrl+C)";
-        if (*backupMessage) {
-            vaultsArray[vaultsCount + index++] = "A backup was launched. Do not immediatly close the program. After a few seconds, you can safely ignore this message.";
-        };
 
-        *backupMessage = 0; // we reset it to show the message only once
+        // adds "create a new vault" into the vaultsArray
+        const int extraOptions = 3;
+        vaultsArray = realloc(vaultsArray, (vaultsCount + extraOptions) * sizeof(char *)); // resize vaultsArray to fit the extra options
+        vaultsArray[vaultsCount] = "Create a new vault";                                   // some more options that are not vaults
+        vaultsArray[vaultsCount + 1] = "Settings";
+        vaultsArray[vaultsCount + 2] = "Quit (Ctrl+C)";
 
         vaultSelected = ncursesSelect(vaultsArray, "Select vault to open (Use arrows or WASD, Enter to select):", vaultsCount, extraOptions, " ", "Or select an option below", "", shouldDebug);
 
@@ -612,8 +594,7 @@ backup_config_end:
         }
 
         debug("Selected vault: %s", vaultSelected);
-        if (strcmp(vaultSelected, "Create a new vault") != 0 && strcmp(vaultSelected, "Settings") != 0 && strcmp(vaultSelected, "Quit (Ctrl+C)") != 0 && strcmp(vaultSelected, "Backup now") != 0 &&
+        if (strcmp(vaultSelected, "Create a new vault") != 0 && strcmp(vaultSelected, "Settings") != 0 && strcmp(vaultSelected, "Quit (Ctrl+C)") != 0) {
-            strcmp(vaultSelected, "A backup was launched. Do not immediatly close the program. After a few seconds, you can safely ignore this message.") != 0) {
         note_selection:
             bypassSelectionVault = 0; // we must reset bypassSelectionVault to not get stuck in a
                                       // infinite loop of bypassing
@@ -644,13 +625,12 @@ backup_config_end:
                     altDebug("└------------------------------\n");
                 }
                 // adds options
-                int extraNotesOptions = 5;
+                int extraNotesOptions = 4;
                 filesArray = realloc(filesArray, (filesCount + extraNotesOptions) * sizeof(char *)); // resize filesArray to fit the extra options
                 filesArray[filesCount] = "Create new note";
-                filesArray[filesCount + 1] = "Search inside the vault";
+                filesArray[filesCount + 1] = "Back to vault selection";
-                filesArray[filesCount + 2] = "Back to vault selection";
+                filesArray[filesCount + 2] = "Delete vault";
-                filesArray[filesCount + 3] = "Delete vault";
+                filesArray[filesCount + 3] = "Quit (Ctrl+C)";
-                filesArray[filesCount + 4] = "Quit (Ctrl+C)";
                 char *noteSelected;
                 // if we set to bypass the note selector
                 if (bypassSelectionNote) {
@@ -681,7 +661,7 @@ backup_config_end:
                 free(filesArray);
                 debug("Selected note: %s", noteSelected);
                 if (strcmp(noteSelected, "Create new note") != 0 && strcmp(noteSelected, "Back to vault selection") != 0 && strcmp(noteSelected, "Delete vault") != 0 &&
-                    strcmp(noteSelected, "Quit (Ctrl+C)") != 0 && strcmp(noteSelected, "Search inside the vault") != 0) {
+                    strcmp(noteSelected, "Quit (Ctrl+C)") != 0) {
                 open_note:
                     bypassSelectionNote = 0; // we must reset bypassSelectionNote to avoid getting into an infinite
                                              // loop of bypassing the note selection
@@ -718,13 +698,6 @@ backup_config_end:
                     noteSelected = createNewNote(notesDirectoryString, vaultSelected, bypassSelectionNote, bypassSelectionNoteValue, journalRegex, shouldDebug);
                     // we can just go back to open_note
                     goto open_note;
-                } else if (strcmp(noteSelected, "Search inside the vault") == 0) {
-                    char *vaultPath = malloc(PATH_MAX);
-                    snprintf(vaultPath, PATH_MAX, "%s/%s/", notesDirectoryString, vaultSelected);
-                    char *result = fzfSelect(vaultPath, "Input text to be searched", shouldDebug);
-                    bypassSelectionNote = 1;
-                    bypassSelectionNoteValue = result;
-                    free(vaultPath);
                 } else if (strcmp(noteSelected, "Back to vault selection") == 0) {
                     shouldChangeVault = 1;
                 } else if (strcmp(noteSelected, "Delete vault") == 0) {
@@ -758,11 +731,6 @@ backup_config_end:
         } else if (strcmp(vaultSelected, "Settings") == 0) {
             openEditor(configPath, editorToOpen, 0, 0,
                        shouldDebug); // as this is not a md file we set render and jumptoEnfOfFile to 0
-        } else if (strcmp(vaultSelected, "Backup now") == 0) {
-            debug("Running a forced backup");
-            forceBackup = 1;
-            handleBackups(directoriesArray, numDirectories, backupDirectoriesArray, homedir, interval, (const char **)rsyncArgs, rsyncArgsNumber, forceBackup, backupMessage, shouldDebug);
-            debug("backupMessage was set to %d by a normal backup", *backupMessage);
         } else if (strcmp(vaultSelected, "Quit (Ctrl+C)") == 0) {
             debug("The program was exited");
             shouldExit = 1;

src/ui.c

@@ -179,7 +179,13 @@ char *fzfSelect(char *pathToFiles, char *selectText, int shouldDebug) {
     error(fd == -1, "program", "mkstemp failed");
     close(fd);
 
+    /*
+     * STEP 1:
+     * Build index once into temp file
+     * format: file:line:content
+     */
     snprintf(command, sizeof(command), "rg --line-number --no-heading --color=never . \"%s\" > %s", pathToFiles, indexFile);
+
     debug("INDEX CMD: %s", command);
 
     if (system(command) != 0) {
@@ -187,6 +193,45 @@ char *fzfSelect(char *pathToFiles, char *selectText, int shouldDebug) {
         error(1, "program", "rg indexing failed");
     }
 
+    /*
+     * STEP 2:
+     * Use fzf on the index file (NO rg anymore)
+     */
+    /*
+      EXPLANATION:
+
+      cat %s
+        → feeds prebuilt index file (format: file:line:content) into fzf
+
+      fzf --delimiter ':'
+        → splits each line into fields:
+           {1} = file path
+           {2} = line number
+           {3} = content
+
+      --prompt
+        → UI prompt text shown in fzf
+
+      --preview
+        → runs a shell command for selected item:
+           file={1}  → current file
+           line={2}  → line number of match
+
+      nl -ba "$file"
+        → prints file with line numbers
+
+      sed -n "$((line-5)),$((line+5))p"
+        → extracts a window of 5 lines above and below match
+
+      sed "... -> ..."
+        → highlights the matched line (middle of window) with red arrow
+
+      --preview-window=right:60%:hidden
+        → preview appears on right, 60% width, initially hidden
+
+      --bind 'change:show-preview'
+        → preview only appears after first selection change (not at startup)
+    */
     snprintf(command, sizeof(command),
              "cat %s | fzf --delimiter ':' --prompt='%s' "
              "--preview 'file={1}; line={2}; nl -ba \"$file\" | sed -n \"$((line-5)),$((line+5))p\" | "
@@ -209,25 +254,16 @@ char *fzfSelect(char *pathToFiles, char *selectText, int shouldDebug) {
         buffer[strcspn(buffer, "\n")] = '\0';
         result = strdup(buffer);
     }
-    debug("Buffer: %s", buffer);
-    debug("result: %s", result);
 
     // cut at first ':'
     result = strtok(result, ":");
-    // we need to cut out the whole pathToFiles
+    // cut at / (because we need the full paths before and we only need to return the journal entry)
-    int pathToFilesLen = strlen(pathToFiles);
+    char *token = strtok(result, "/");
-    int cutOut = 0;
+    result = NULL;
-    for (int i = 0; i < pathToFilesLen; i++) {
+    while (token != NULL) {
-        if (pathToFiles[i] == result[i]) {
+        result = token;
-            cutOut = i;
+        token = strtok(NULL, "/"); // Passing NULL means “don’t start a new string, resume
     }
-    }
-    result += cutOut + 1; // the + 1 cuts the first /
-
-    // in case we select a journal, we won't open the entry just yet. We only need to return the journal name (everything before [now the first] /
-    result = strtok(result, "/");
-
-    debug("Cleaned note: %s", result);
 
     // clean up
     pclose(fzfPipe);

src/utils.c

@@ -167,9 +167,8 @@ void initAppFilesAndDirs(const char *home, const int shouldDebug) {
 }
 
 void handleBackups(char **sourceDirectoryArray, const int sourceNumber, char **destinationDirectoryArray, const char *homeDir, const int interval, const char **rsyncArguments, const int rsyncArgumentsNumber,
-                   const int forceBackup, int *backupMessage, const int shouldDebug) {
+                   const int shouldDebug) {
     int shouldBackup = 0;
-
     time_t now = time(NULL);
     debug("Time since epoch is %ld", (long)now);
     char cacheFilePATH[PATH_MAX];
@@ -204,12 +203,8 @@ void handleBackups(char **sourceDirectoryArray, const int sourceNumber, char **d
             error(1, "program", "Invalid timestamp in cache file: %s", line);
         }
         double deltaTime = difftime(now, lastBackupTime);
-        if (deltaTime > interval || forceBackup) {
+        if (deltaTime > interval) {
-            if (!forceBackup) {
             debug("(difftime) %f is greater than (interval) %d -> backuping...", deltaTime, interval);
-            } else {
-                debug("Backup was forced. backuping...");
-            }
             shouldBackup = 1;
             cacheFile = fopen(cacheFilePATH, "w");
             if (!cacheFile) {
@@ -223,7 +218,6 @@ void handleBackups(char **sourceDirectoryArray, const int sourceNumber, char **d
     }
 
     if (shouldBackup) {
-        *backupMessage = 1;
         debug("A backup is needed");
         for (int i = 0; i < sourceNumber; i++) {
             debug("%s", destinationDirectoryArray[i]);

src/utils.h

@@ -81,8 +81,7 @@ If need launches in the background rsync to do the backuping.
 Each pair of source/destination will launch one rsync process.
 If a pair don't need to be backed up, the destination should be set to NULL.
 rsyncArgs is the array of arguments to be passed to rsync. Do not inclue destination or source. It
-will be added in the function.
+will be added in the function.*/
-backupMessage will be set to 1 if a backup was launched.*/
 void handleBackups(char **sourceDirectoryArray, const int sourceDirectoryNumber, char **destinationDirectoryArray, const char *homeDir, const int interval, const char **rsyncArgs, const int rsyncArgsNumber,
-                   const int forceBackup, int *backupMessage, const int shouldDebug);
+                   const int shouldDebug);
 #endif