Update ReadMe.md

Make it more clear how the fractional part of hours is intended to be minutes. Whoops.

ReadMe.md

@@ -2,24 +2,33 @@
 CLI tracker to prioritize your limited time by ELO ranking media.
 
 ## Initial Ideas
-- [ ] Mark books read/unread/in-progress.
+- [x] Mark books read/unread/in-progress.
 - [x] Show top 10 / bottom 10. Show only in-progress or unread.
 - [ ] Rank only in-progress or unread.
-- [ ] Track books by title, author, and series. Default is to recognize "by" or "(series)" and automatically sort into relevant fields.
+- [x] Track books by title, author, and series. Default is to recognize "by" or "(series)" and automatically sort into relevant fields.
   - [x] But also almost nothing is actually *needed*.
-- [x] Store progress as a numerical value? (Unread = 0, read = 1, in-progress in-between? Too easy to forget how it works?)
 - [x] Store pages as an option,
-  - [ ] allow a weighted priority based on remaining percentage or whatever.
+  - [x] allow a weighted priority based on remaining percentage or whatever.
 - [x] Store items as an array instead of object, because that makes the JSON output more consistent -> smaller JSON commit differences.
+      - [ ] I am not sure this actually helps much when EACH ITEM is still an
+            object. I need to make the JSON export sort its keys.
+- [ ] Re-implement ELO ranking.
+- [ ] Display filter/sort options to output lists. (Focus only on top 10 items?)
 
 ## Contributions
 
-This repo is hosted at https://gitea.tangentfox.com/tangent/Asymtome and
-force-pushed to https://github.com/TangentFoxy/Asymtome when commits are made.
+This repo is hosted at https://gitea.tangentfox.com/tangent/Asymptome and
+force-pushed to https://github.com/TangentFoxy/Asymptome when commits are made.
 I accept pull requests and issues, but management of the code is handled there.
 
 Licensing? I don't care. Do whatever you want. IP rights are stupid.
 
+## Ideas
+- [ ] When importing, allow user to make a choice when duplicates are detected
+      instead of rejecting them automatically.
+- [ ] When importing, a duplicate should still be checked for missing data, and
+      merge rather than ignore.
+
 ## Book Data Structure
 ```json
 {
@@ -28,19 +37,23 @@ Licensing? I don't care. Do whatever you want. IP rights are stupid.
   "series": "Series",
   "genre": "Fiction",
   "pages": 100,
+  "hours": 1.30,
   "priority": 0,
   "progress": 0.5,
   "hidden": true
 }
 ```
 
-- `title`, `author`, `series`, `pages`, `genre`, and `hidden` are optional.
+- `title`, `author`, `series`, `pages`, `hours`, `genre`, and `hidden` are
+  optional.
 - At least one of `title`, `author`, `series`, or `genre` must be defined.
 - `priority` is the ELO ranking, initializing to `0`.
 - `progress` represents read/unread/in-progress status. `0` is unread, `1` is
   read, and anything in-between in a percentage of progress.
 - `hidden` is undefined or `true` to hide a book from ALL of the interface
   without deleting its data.
+- `hours` is hours.minutes rather than the fractional part being percentage of
+  an hour.
 
 Despite the script supporting otherwise, I highly recommend only using this for
 *specific book titles*. In my experience, using entries representing multiple

asymptome.lua

@@ -1,8 +1,12 @@
 #!/usr/bin/env luajit
+local filters = require "lib.filters"
 local json = require "lib.dkjson"
+local sort_orders = require "lib.sort_orders"
 math.randomseed(os.time())
 
 local default_file = "books.json"
+local debug = function() end
+-- local debug = function(...) print(...) end
 
 local path_exists = function(path_name)
   local file = io.open(path_name, "r")
@@ -18,15 +22,23 @@ local load_json = function(file_name)
   assert(file, error_message)
   local result = json.decode(file:read("*all"))
   file:close()
+
+  result._loaded_file_location = file_name
   return result
 end
 
-local save_json = function(file_name, data)
+local save_json = function(data)
+  local file_name = data._loaded_file_location
+  data._loaded_file_location = nil
+
   local file, error_message = io.open(file_name, "w")
   assert(file, error_message)
   file:write(json.encode(data, { indent = true, }))
   file:write("\n")
   file:close()
+  debug("Saved.")
+
+  data._loaded_file_location = file_name
 end
 
 local get_random_order = function(array)
@@ -40,69 +52,6 @@ local get_random_order = function(array)
   return order
 end
 
-local filters = {
-  all_books = function(book)
-    if book.hidden then return false end
-    return true
-  end,
-  unread = function(book)
-    if book.hidden then return false end
-    if book.progress == 0 then
-      return true
-    end
-    return false
-  end,
-  read = function(book)
-    if book.hidden then return false end
-    if book.progress == 1 then
-      return true
-    end
-    return false
-  end,
-  in_progress = function(book)
-    if book.hidden then return false end
-    if book.progress > 0 and book.progress < 1 then
-      return true
-    end
-    return false
-  end,
-  exclude_series = function(book)
-    if book.hidden then return false end
-    if book.series and not (book.title or book.author) then
-      return false
-    end
-    return true
-  end,
-}
-
-local sort_orders
-sort_orders = {
-  most_progress = function(A, B)
-    return A.progress > B.progress
-  end,
-  least_progress = function(A, B)
-    return A.progress < B.progress
-  end,
-  highest_priority = function(A, B)
-    return A.priority > B.priority
-  end,
-  lowest_priority = function(A, B)
-    return A.priority < B.priority
-  end,
-  most_pages_remaining = function(A, B)
-    if not (A.pages and B.pages) then -- if pages is unknown for both, fallback to percentage
-      return A.progress < B.progress
-    end
-    local average_page_count = data.total_pages / #data.books
-    local a = (A.pages or average_page_count) - (A.pages or average_page_count) * A.progress
-    local b = (B.pages or average_page_count) - (B.pages or average_page_count) * B.progress
-    return a > b
-  end,
-  fewest_pages_remaining = function(A, B)
-    return not sort_orders.most_pages_remaining(A, B)
-  end,
-}
-
 local get_display_name = function(book)
   local result = ""
 
@@ -132,7 +81,10 @@ local get_display_name = function(book)
   end
 
   if book.pages then
-    result = result .. " ~" .. math.floor(book.progress * book.pages) .. "/" .. book.pages .. " pages read"
+    result = result .. " ~" .. math.floor(book.progress * book.pages) .. "/" .. book.pages .. " pages read (" .. math.floor(book.progress * 100) .. "%)"
+  elseif book.hours then
+    -- TODO correct for the fractional part being minutes instead of percent
+    result = result .. " ~" .. math.floor(book.progress * book.hours * 10) / 10 .. "/" .. book.hours .. " hours listened (" .. math.floor(book.progress * 100) .. "%)"
   elseif book.progress > 0 and book.progress < 1 then
     result = result .. " ~" .. math.floor(book.progress * 100) .. "% read"
   end
@@ -140,98 +92,170 @@ local get_display_name = function(book)
   return result
 end
 
+local update_progress_prompt = function(book)
+  if not book then
+    print("Invalid selection.")
+    return false
+  end
 
+  print("Enter a value between 0 and 1 to update progress:")
+  print("  " .. get_display_name(book))
 
--- TODO this procedural code should be split into functions where feasible
+  local input = io.read("*line")
+  local numerical = tonumber(input)
+  if numerical >= 0 and numerical <= 1 then
+    book.progress = numerical
+    return true
+  end
 
-local data
-if path_exists(default_file) then
-  data = load_json(default_file)
-  -- TODO verify data structure
-else
-  data = {
-    books = {},
-    elo = {
-      distance_constant = 5,
-      maximum_change = 2.5,
-    },
-    total_pages = 0,
-    defaults = {
-      launch = {
-        filter = "in_progress",
-        sort = "fewest_pages_remaining",
-      },
-    },
-  }
-  save_json(default_file, data)
+  -- saving is handled by a higher function on the stack
 end
 
+local detect_type = function(input)
+  local author, series, genre
+  local i = input:find(" %(.-series.-%)")
+  if i then
+    series = input:sub(1, i - 1)
+  end
+  local i = input:find(" %(trilogy%)")
+  if i then
+    series = input:sub(1, i - 1)
+  end
+  local i = input:find(" %(.-author%)")
+  if i then
+    author = input:sub(1, i - 1)
+  end
+  local i = input:find(" %(genre%)")
+  if i then
+    genre = input:sub(1, i - 1)
+  end
+  return author, series, genre
+end
 
+local get_book = function(data, input)
+  local title, author, series, genre
+  local i, j = input:find(" by ")
+  if i then
+    title = input:sub(1, i - 1)
+    author = input:sub(j + 1)
+    debug("get_book() Title by Author detected:", title, author)
+  else
+    author, series, genre = detect_type(input)
 
--- main menu
--- TODO should be a loop/function to return to
+    if not (author or series or genre) then
+      title = input
+    end
+  end
 
-local selected_books = {}
-for i = 1, #data.books do
-  local book = data.books[i]
-  if filters[data.defaults.launch.filter](book) then
-    selected_books[#selected_books + 1] = book
+  local book
+  for i = 1, #data.books do
+    local current = data.books[i]
+    if title then
+      if current.title == title then
+        if author then
+          if current.author and current.author == author then
+            book = current
+            break
+          end
+        else
+          book = current
+          break
+        end
+      end
+    elseif author and current.author == author then
+      book = current
+      break
+    elseif series and current.series == series then
+      book = current
+      break
+    elseif genre and current.genre == genre then
+      book = current
+      break
+    end
+  end
+
+  if not book then
+    book = {
+      title = title,
+      author = author,
+      series = series,
+      genre = genre,
+      progress = 0,
+      priority = math.random(),
+    }
+    data.books[#data.books + 1] = book
+  end
+
+  -- this may or may not stay relevant to this placement
+  return update_progress_prompt(book)
+end
+
+local update_book = function(book)
+  -- currently just a wrapper, because I'm not sure if this will stay exactly consistent with that
+  return update_progress_prompt(book)
+end
+
+local book_exists = function(data, book)
+  for i = 1, #data.books do
+    local current = data.books[i]
+    if not (book.title == current.title) then
+      break
+    end
+    if not (book.author == current.author) then
+      break
+    end
+    if not (book.series == current.series) then
+      break
+    end
+    if not (book.genre == current.genre) then
+      break
+    end
+    return current -- we return the object instead of true so it can be updated if desired
+  end
+  return false
+end
+
+local recalculate_total_pages = function(data)
+  data.total_pages = 0
+  data.books_with_page_count = 0
+  for i = 1, #data.books do
+    local book = data.books[i]
+    if book.pages then
+      data.total_pages = data.total_pages + book.pages
+      data.books_with_page_count = data.books_with_page_count + 1
+    end
   end
 end
-table.sort(selected_books, sort_orders[data.defaults.launch.sort])
 
-for i = 1, math.min(10, #selected_books) do
-  local book = selected_books[i]
-  print("  " .. (i == 10 and "0" or i) .. ". " .. get_display_name(book))
-end
-print("Commands: " .. (#selected_books > 0 and "[0-9] to modify a book's progress. " or "") .. "[a <book>] to add a book. [i <file>] to import from a JSON file.")
--- TODO define what can go in <book> and how it will be interpreted
--- TODO actually implement modifying progress and adding books
--- TODO implement elo ranking
--- TODO type title to add or edit an extant book (this is better than the "a" command I wrote above)
-
-local input = io.read("*line")
-
-if input:sub(1, 1) == "i" then
-  -- TODO this should all be broken out into a function
-  import = load_json(input:sub(3))
+local import_json = function(data, file_name)
+  import = load_json(file_name)
   if import.books then
 
     for i = 1, #import.books do
-      data.books[#data.books + 1] = import.books[i]
-      -- TODO detect and ignore duplicates (would be better to provide user an option for what to do with duplicates)
-      --  default should accept highest progress of duplicates?
+      -- TODO allow updating metadata instead of just ignoring
+      if not book_exists(data, import.books[i]) then
+        data.books[#data.books + 1] = import.books[i]
+      end
     end
 
   else -- assume we are importing from decider.lua's format
     for title, value in pairs(import) do
       local run = function()
         local book = { -- minimum required book data strucutre
-          priority = 0,
+          priority = math.random(),
           progress = 0,
         }
 
-        local i = title:find(" %(.-series.-%)")
-        if i then
-          book.series = title:sub(1, i - 1)
-        end
-        local i = title:find(" %(trilogy%)")
-        if i then
-          book.series = title:sub(1, i - 1)
-        end
-        local i = title:find(" %(.-author%)")
-        if i then
-          book.author = title:sub(1, i - 1)
-        end
-        local i = title:find(" %(genre%)")
-        if i then
-          print("Skipping import of \"" .. title .. "\"")
-          return false
-        end
+        book.author, book.series, book.genre = detect_type(title)
 
-        if not (book.series or book.author) then
-          -- TODO detect " by " and split if needed
-          book.title = title
+        if not (book.series or book.author or book.genre) then
+          local i, j = title:find(" by ")
+          if i then
+            book.title = title:sub(1, i - 1)
+            book.author = title:sub(j + 1)
+          else
+            book.title = title
+          end
         end
 
         if type(value) == "number" then
@@ -247,14 +271,159 @@ if input:sub(1, 1) == "i" then
           end
         end
 
-        -- TODO detect duplicates before adding them
-        data.books[#data.books + 1] = book
+        -- TODO allow updating metadata (this and the above need to be split into its own function)
+        if not book_exists(data, book) then
+          data.books[#data.books + 1] = book
+        end
       end
       run()
     end
   end
 
-  save_json(default_file, data)
+  recalculate_total_pages(data)
+  -- we must rely on parent function to save
+end
 
-  -- TODO there should be a sort of main menu I am returned to
+
+
+local get_books_by_preset = function(data, preset_name)
+  local selected_books = {}
+  for i = 1, #data.books do
+    local book = data.books[i]
+    if filters[data.defaults[preset_name].filter](book) then
+      selected_books[#selected_books + 1] = book
+    end
+  end
+  table.sort(selected_books, function(A, B) return sort_orders[data.defaults[preset_name].sort](A, B, data) end)
+  return selected_books
+end
+
+local print_list = function(data, options)
+  local gsplit = function(s, delimiter)
+    local function escape_special_characters(s)
+      local special_characters = "[()%%.[^$%]*+%-?]"
+      if s == nil then return end
+      return (s:gsub(special_characters, "%%%1"))
+    end
+
+    delimiter = delimiter or ","
+    if s:sub(-#delimiter) ~= delimiter then s = s .. delimiter end
+    return s:gmatch("(.-)" .. escape_special_characters(delimiter))
+  end
+  local split = function(s, delimiter)
+    local result = {}
+    for item in gsplit(s, delimiter) do
+      result[#result + 1] = item
+    end
+    return result
+  end
+
+  options = split(options, " ")
+
+  local selected_books = {}
+  for i = 1, #data.books do
+    local book = data.books[i]
+    if filters[options[1]](book) then
+      selected_books[#selected_books + 1] = book
+    end
+  end
+  table.sort(selected_books, function(A, B) return sort_orders[options[2]](A, B, data) end)
+
+  local limit = 10
+  if options[3] == "all" then
+    limit = #selected_books
+  end
+
+  print("")
+  for i = 1, limit do
+    local book = selected_books[i]
+    print(i .. ". " .. get_display_name(book))
+  end
+
+  print("  Press enter to continue.")
+  io.read("*line")
+end
+
+local launch = function(file_name)
+  local data
+  if path_exists(file_name) then
+    data = load_json(file_name)
+    -- TODO verify data structure
+    local data_modified = false
+    if not data.books_with_page_count then
+      recalculate_total_pages(data)
+      data_modified = true
+    end
+    if not data.defaults.launch.max_displayed then
+      data.defaults.launch.max_displayed = 10
+      data_modified = true
+    end
+    if data_modified then
+      save_json(data)
+    end
+  else
+    data = {
+      books = {},
+      elo = {
+        distance_constant = 5,
+        maximum_change = 2.5,
+      },
+      total_pages = 0,
+      books_with_page_count = 0,
+      defaults = {
+        launch = {
+          filter = "in_progress",
+          sort = "fewest_pages_remaining",
+        },
+      },
+    }
+    save_json(data)
+  end
+
+  local selected_books = get_books_by_preset(data, "launch")
+
+  return data, selected_books
+end
+
+local main = function(data, selected_books)
+  local book_display_count = data.defaults.launch.max_displayed == 0 and #selected_books or data.defaults.launch.max_displayed
+  for i = 1, book_display_count do
+    local book = selected_books[i]
+    print("  " .. i .. ". " .. get_display_name(book))
+  end
+  print("Commands: " .. (#selected_books > 0 and "[#] to modify a book's progress. " or "") .. "[i <file>] to import from a JSON")
+  print("          file. [recalculate pages] Enter nothing to exit.")
+  print("  Adding/Selecting: Title OR Title by Author OR \"Name (type)\" for other types.")
+  print("  Listing: list [filter] [sort] (all)")
+  -- TODO implement elo ranking
+
+  local input = io.read("*line")
+  local numerical = tonumber(input)
+
+  if #input == 0 then
+    os.exit(0)
+  elseif numerical then
+    update_book(selected_books[numerical])
+  elseif input:sub(1, 1) == "i" then
+    import_json(data, input:sub(3))
+  elseif input:find("list ") == 1 then
+    print_list(data, input:sub(6))
+    return true
+  elseif input:find("recalculate pages") == 1 then
+    recalculate_total_pages(data)
+  else -- assume we are trying to add/select a book
+    get_book(data, input)
+    -- but that just returns a book, we need to DO something with it ??
+    -- right now, it demands a progress update;
+    -- TODO add mode selection to select and update vs select only mode that THEN asks what to do?
+    --       no? these are completely separate modes, there should be quick add, update progress, rank mode, add pages mode, etc
+  end
+
+  save_json(data)
+  return true
+end
+
+local data, selected_books = launch(default_file)
+while true do
+  main(data, selected_books)
 end

lib/filters.lua

@@ -0,0 +1,43 @@
+local filters = {
+  all_books = function(book)
+    if book.hidden then return false end
+    return true
+  end,
+  unread = function(book)
+    if book.hidden then return false end
+    if book.progress == 0 then
+      return true
+    end
+    return false
+  end,
+  read = function(book)
+    if book.hidden then return false end
+    if book.progress == 1 then
+      return true
+    end
+    return false
+  end,
+  in_progress = function(book)
+    if book.hidden then return false end
+    if book.progress > 0 and book.progress < 1 then
+      return true
+    end
+    return false
+  end,
+  exclude_series = function(book)
+    if book.hidden then return false end
+    if book.series and not (book.title or book.author) then
+      return false
+    end
+    return true
+  end,
+  audiobooks_only = function(book)
+    if book.hidden then return false end
+    if book.hours then
+      return true
+    end
+    return false
+  end,
+}
+
+return filters

lib/sort_orders.lua

@@ -0,0 +1,43 @@
+local sort_orders
+sort_orders = {
+  most_progress = function(A, B)
+    return A.progress > B.progress
+  end,
+  least_progress = function(A, B)
+    return A.progress < B.progress
+  end,
+  highest_priority = function(A, B)
+    return A.priority > B.priority
+  end,
+  lowest_priority = function(A, B)
+    return A.priority < B.priority
+  end,
+  most_pages_remaining = function(A, B, data)
+    if not (A.pages and B.pages) then -- if pages is unknown for both, fallback to percentage
+      return A.progress < B.progress
+    end
+    local average_page_count = data.total_pages / data.books_with_page_count
+    if not (average_page_count == average_page_count) then
+      average_page_count = 300 -- based on average novel length
+    end
+    local a = (A.pages or average_page_count) - (A.pages or average_page_count) * A.progress
+    local b = (B.pages or average_page_count) - (B.pages or average_page_count) * B.progress
+    return a > b
+  end,
+  fewest_pages_remaining = function(A, B, data)
+    return not sort_orders.most_pages_remaining(A, B, data)
+  end,
+  most_time_remaining = function(A, B)
+    if not (A.hours and B.hours) then -- fallback to percentage
+      return A.progress < B.progress
+    end
+    local a = A.hours - A.hours * A.progress
+    local b = B.hours - B.hours * B.progress
+    return a > b
+  end,
+  least_time_remaining = function(A, B)
+    return not sort_orders.most_time_remaining(A, B)
+  end,
+}
+
+return sort_orders