Merge pull request #39 from joereynolds/feature/recent-subcommand

Add in 'recent' subcommand

Author: joereynolds

README.md

@@ -249,6 +249,17 @@ The complete command is:
 jn mv --plain
 ```
 
+### Get recent notes
+
+```
+jn recent
+```
+
+This will display the 15 most recently edited notes.
+Useful for when you forget _that_ important document
+
+Both `jn r` and `jn re` also work.
+
 ### Creating a book
 
 A book is optional. Conceptually it's where you store related notes. You might

src/files.nim

@@ -3,6 +3,11 @@ import categories, config, console, templates/templates
 
 type DirectoryListing = Table[string, int]
 
+type 
+  FileRecord* = object
+    name*: string
+    modifiedTime*: Time
+
 proc getFullNotePath*(note: string, config: Config, book: string = ""): Path =
   let suffix = getNotesSuffix(config)
   let dateFormat = getNotesPrefix(config)
@@ -57,15 +62,26 @@ proc createNote*(noteName: string, config: Config, book: string = "") =
     let message = "Created " & $name
     success(message)
 
-proc getFilesForDir*(dir: string, filter = {pcFile, pcLinkToFile}): seq[string] =
+proc getFilesForDir*(dir: string, filter = {pcFile, pcLinkToFile}): seq[FileRecord] =
   result = @[]
 
   for kind, path in walkDir(dir):
     if path.isHidden(): # TODO - respect --hidden flag
       continue
 
     if kind in filter:
-      result.add(path)
+
+      # Technically the file should exist but there can be times where a
+      # symlink points to a now-removed file.
+      # This means we still need to check if the file is legit...
+      if not fileExists(path):
+        continue
+
+      var record = FileRecord(
+        name: path,
+        modifiedTime: getLastModificationTime(path)
+      )
+      result.add(record)
 
     if kind == pcDir:
       # Recursively add paths from subdirectories

src/fuzzy.nim

@@ -2,7 +2,7 @@ import config
 import console
 import files
 
-import std/[os, osproc, parsecfg, streams, strutils]
+import std/[os, osproc, parsecfg, sequtils, streams, strutils]
 
 proc formatForFuzzy(matches: seq[string]): string =
   matches.join("\n")
@@ -36,4 +36,4 @@ proc selectFromChoice*(choices: seq[string], config: Config): string =
 
 proc selectFromDir*(fromDir: string, config: Config): string =
   let choices = getFilesForDir(fromDir)
-  return selectFromChoice(choices, config)
+  return selectFromChoice(choices.mapIt(it.name), config)

src/grep.nim

@@ -21,12 +21,12 @@ proc getMatches*(term: string, config: Config): seq[string] =
 
   for file in getFilesForDir(getNotesPath(config)):
 
-    if isSkippable(file):
+    if isSkippable(file.name):
       continue
 
     try:
-      if readFile(file).contains(pattern):
-        matches.add(file)
+      if readFile(file.name).contains(pattern):
+        matches.add(file.name)
     except IOError:
       discard
 

src/jn.nim

@@ -4,7 +4,11 @@ import std/parseopt
 import std/strutils
 
 import config
-import subcommands/[book, cat, config as sconfig, edit, grep, help, mv, rm, star, tags, tmpl]
+import subcommands/[
+  book, cat, config as sconfig, edit,
+  grep, help, mv, recent, rm,
+  star, tags, tmpl
+]
 import files
 import console
 
@@ -48,20 +52,24 @@ for kind, key, val in getopt():
       help.process(configuration)
       quit()
 
-    if key in tmpl.aliases:
-      tmpl.process(configuration)
+    if key in mv.aliases:
+      mv.process(configuration, params)
       quit()
 
-    if key in star.aliases:
-      star.process(configuration)
+    if key in recent.aliases:
+      recent.process(configuration, params)
       quit()
 
     if key in rm.aliases:
       rm.process(configuration)
       quit()
 
-    if key in mv.aliases:
-      mv.process(configuration, params)
+    if key in star.aliases:
+      star.process(configuration)
+      quit()
+
+    if key in tmpl.aliases:
+      tmpl.process(configuration)
       quit()
 
     if key in grep.aliases:

src/subcommands/book.nim

@@ -13,7 +13,7 @@ proc printNotesForBook(book: string, config: Config) =
   var lastPaths = @[""]
 
   for note in notes:
-    lastPaths.add(lastPathPart(note))
+    lastPaths.add(lastPathPart(note.name))
 
   lastPaths.sort()
 

src/subcommands/mv.nim

@@ -37,15 +37,15 @@ proc process*(config: Config, flags: seq[string]) =
 
   if "--plain" in flags:
     fileName = newName
-  
+
   let oldPath = choice
   let dirPath = parentDir(oldPath)
   let newPath = dirPath / fileName
-  
+
   if fileExists(newPath):
     warn("File already exists at: " & newPath)
     quit()
-  
+
   try:
     moveFile(oldPath, newPath)
     success("Renamed: " & lastPathPart(oldPath) & " -> " & fileName)

src/subcommands/recent.nim

@@ -0,0 +1,16 @@
+import std/[algorithm, parsecfg, times]
+import ../[console, config, files]
+
+const aliases* = @["r", "re", "recent"]
+
+proc process*(config: Config, flags: seq[string]) =
+
+  let notes = getFilesforDir(getNotesPath(config))
+  let byTime = notes.sortedByIt(it.modifiedTime).reversed()
+
+  # TODO - use --limit flag here
+  for note in byTime[0 .. 15]:
+    stdout.write(note.name)
+    info("(" & $note.modifiedTime & ")")
+
+  

src/subcommands/rm.nim

@@ -24,7 +24,7 @@ proc process*(config: Config) =
     content = readFile(choice)
   except IOError:
     discard
-    
+
   removeFile(choice)
 
   let (tempFile, path) = createTempFile("jn-", "")

src/subcommands/tags.nim

@@ -12,18 +12,18 @@ const aliases* = @["tag", "tags"]
 
 proc process*(searchTerm: string, config: Config) =
   var tagTerm = searchTerm.strip()
-  
+
   # Strip '#' if user provided it
   if tagTerm.startsWith("#"):
     tagTerm = tagTerm[1..^1]
-  
+
   if tagTerm == "":
     echo "Tags command is missing the tag name"
     quit()
 
   # Add '#' prefix to search for tags
   let tagSearch = "#" & tagTerm
-  
+
   let notes = getFilesForDir(getNotesPath(config))
   let fuzzy = getFuzzyProvider(config)
   let matches = search(tagSearch, config)