markdownr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e87f1a091aae321ef6ed25f1780ffc034278328d6432762d7126947029cf63
-  data.tar.gz: aced5406c9386d7f09f46484bec59c4e6ef4df7dab40d0fa497ed37c1a4da83c
+  metadata.gz: eb86e2f05b5c71f9365fba3fdcf497f1c53439e7b395d13efb674eb36947f3dc
+  data.tar.gz: 3c2d3da0044862746e47d76c386712b8ab8a0f6c1a7c60514e511953e2af5542
 SHA512:
-  metadata.gz: 923029aa7a8065c52983debabd69ae1e411a24cf8168b13629457ff8f0dbb4ceafc93db7b4755d73cbb2f443469200534e06b3316901ef0a03cf70f157551ef1
-  data.tar.gz: 533e4b984b363692a3fa7a8269818d246cbd5f5846a92103f3eb9b250e57376bcf030953fbc71496502190a93d7951bebbc9610271874c1ec4f25e2ef78426d1
+  metadata.gz: 1aa636326b55bbff250fa04e13f5befadda9791fbabdf175c7c774886d8df793ee4e1ecc93d59a3bc01428eaa26e2c104ab6b831dd0e1323666e970fd64be634
+  data.tar.gz: 1ad0d23592aa3874b519cfa3afbfc310bc0fd12c90c223a54bf4a530e1e7ca7da77d1c00a548210fde5a043ffad2f52460f40a2989cb30b2f900db666ad3fac1

data/lib/markdown_server/app.rb

@@ -7,6 +7,7 @@ require "json"
 require "uri"
 require "cgi"
 require "pathname"
+require "set"
 
 module MarkdownServer
   class App < Sinatra::Base
@@ -192,6 +193,150 @@ module MarkdownServer
         return settings.custom_title if settings.respond_to?(:custom_title) && settings.custom_title
         File.basename(root_dir).gsub(/[-_]/, " ").gsub(/\b\w/, &:upcase)
       end
+
+      def search_form_path(relative_path)
+        "/search/" + relative_path.split("/").map { |p| encode_path_component(p) }.join("/")
+      end
+
+      def parent_dir_path(relative_path)
+        parts = relative_path.split("/")
+        parts.length > 1 ? parts[0..-2].join("/") : ""
+      end
+
+      BINARY_EXTENSIONS = %w[
+        .png .jpg .jpeg .gif .bmp .ico .svg .webp
+        .pdf .epub .mobi
+        .zip .gz .tar .bz2 .7z .rar
+        .exe .dll .so .dylib .o
+        .mp3 .mp4 .avi .mov .wav .flac .ogg
+        .woff .woff2 .ttf .eot .otf
+        .pyc .class .beam
+        .sqlite .db
+      ].freeze
+
+      MAX_SEARCH_FILES = 100
+      MAX_FILE_READ_BYTES = 512_000  # 500KB
+      CONTEXT_LINES = 2  # lines before/after match to send
+      MAX_LINE_DISPLAY = 200  # chars before truncating a line
+
+      def search_files(dir_path, regexes)
+        results = []
+        base = File.realpath(root_dir)
+
+        catch(:search_limit) do
+          walk_directory(dir_path) do |file_path|
+            throw :search_limit if results.length >= MAX_SEARCH_FILES
+
+            content = File.binread(file_path, MAX_FILE_READ_BYTES) rescue next
+            content.force_encoding("utf-8")
+            next unless content.valid_encoding?
+
+            # All regexes must match somewhere in the file
+            next unless regexes.all? { |re| re.match?(content) }
+
+            relative = file_path.sub("#{base}/", "")
+            lines = content.lines
+            matches = collect_matching_lines(lines, regexes)
+
+            results << { path: relative, matches: matches }
+          end
+        end
+
+        results
+      end
+
+      def walk_directory(dir_path, &block)
+        Dir.entries(dir_path).sort.each do |entry|
+          next if entry.start_with?(".") || EXCLUDED.include?(entry)
+          full = File.join(dir_path, entry)
+
+          if File.directory?(full)
+            walk_directory(full, &block)
+          elsif File.file?(full)
+            ext = File.extname(entry).downcase
+            next if BINARY_EXTENSIONS.include?(ext)
+            block.call(full)
+          end
+        end
+      end
+
+      def collect_matching_lines(lines, regexes)
+        match_indices = Set.new
+        lines.each_with_index do |line, i|
+          if regexes.any? { |re| re.match?(line) }
+            match_indices << i
+          end
+        end
+
+        # Build context groups
+        groups = []
+        sorted = match_indices.sort
+
+        sorted.each do |idx|
+          range_start = [idx - CONTEXT_LINES, 0].max
+          range_end = [idx + CONTEXT_LINES, lines.length - 1].min
+
+          if groups.last && range_start <= groups.last[:end] + 1
+            groups.last[:end] = range_end
+          else
+            groups << { start: range_start, end: range_end }
+          end
+        end
+
+        groups.map do |g|
+          context_lines = (g[:start]..g[:end]).map do |i|
+            distance = match_indices.include?(i) ? 0 : match_indices.map { |m| (m - i).abs }.min
+            { number: i + 1, text: lines[i].to_s.chomp, distance: distance }
+          end
+          { lines: context_lines }
+        end
+      end
+
+      def highlight_search_line(text, regexes, is_match)
+        # Build a combined regex with non-greedy quantifiers for shorter highlights
+        combined = Regexp.union(regexes.map { |r|
+          Regexp.new(r.source.gsub(/(?<!\\)([*+}])(?!\?)/, '\1?'), r.options)
+        })
+
+        # Truncate long lines, centering around the first match
+        prefix_trunc = false
+        suffix_trunc = false
+        if text.length > MAX_LINE_DISPLAY
+          if is_match && (m = combined.match(text))
+            center = m.begin(0) + m[0].length / 2
+            half = MAX_LINE_DISPLAY / 2
+            start = [[center - half, 0].max, [text.length - MAX_LINE_DISPLAY, 0].max].min
+          else
+            start = 0
+          end
+          prefix_trunc = start > 0
+          suffix_trunc = (start + MAX_LINE_DISPLAY) < text.length
+          text = text[start, MAX_LINE_DISPLAY]
+        end
+
+        html = ""
+        html << '<span class="truncated">...</span>' if prefix_trunc
+        if is_match
+          pieces = text.split(combined)
+          matches = text.scan(combined)
+          pieces.each_with_index do |piece, i|
+            html << h(piece)
+            html << %(<span class="highlight-match">#{h(matches[i])}</span>) if matches[i]
+          end
+        else
+          html << h(text)
+        end
+        html << '<span class="truncated">...</span>' if suffix_trunc
+        html
+      end
+
+      def compile_regexes(query)
+        words = query.split(/\s+/).reject(&:empty?)
+        return nil if words.empty?
+        words.map { |w| Regexp.new(w, Regexp::IGNORECASE) }
+      rescue RegexpError => e
+        raise RegexpError, e.message
+      end
     end
 
     # Routes
@@ -225,6 +370,36 @@ module MarkdownServer
       send_file real_path, disposition: "attachment"
     end
 
+    get "/search/?*" do
+      requested = params["splat"].first.to_s.chomp("/")
+      @query = params[:q].to_s.strip
+
+      if requested.empty?
+        search_dir = File.realpath(root_dir)
+      else
+        search_dir = safe_path(requested)
+        halt 404 unless File.directory?(search_dir)
+      end
+
+      @path = requested
+      @crumbs = breadcrumbs(requested)
+      @title = requested.empty? ? dir_title : File.basename(requested)
+      @results = []
+      @regexes = nil
+      @error = nil
+
+      unless @query.empty?
+        begin
+          @regexes = compile_regexes(@query)
+          @results = search_files(search_dir, @regexes) if @regexes
+        rescue RegexpError => e
+          @error = "Invalid regex: #{e.message}"
+        end
+      end
+
+      erb :search
+    end
+
     private
 
     def render_directory(real_path, relative_path)

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/views/directory.erb

@@ -15,7 +15,13 @@
 })();
 </script>
 
-<h1 class="page-title"><%= h(@title) %></h1>
+<div class="title-bar">
+  <h1 class="page-title"><%= h(@title) %></h1>
+  <form class="search-form" action="<%= search_form_path(@path) %>" method="get">
+    <input type="text" name="q" placeholder="Search files..." value="<%= h(params[:q].to_s) %>">
+    <button type="submit">Search</button>
+  </form>
+</div>
 
 <div class="dir-header">
   <div class="dir-count">

data/views/layout.erb

@@ -416,12 +416,170 @@
     .toc-mobile .toc-h3 { padding-left: 0.8rem; }
     .toc-mobile .toc-h4 { padding-left: 1.4rem; }
 
+    /* Title bar with search */
+    .title-bar {
+      display: flex;
+      align-items: baseline;
+      gap: 1rem;
+      margin: 0 0 1.2rem;
+      border-bottom: 2px solid #d4b96a;
+      padding-bottom: 0.5rem;
+    }
+    .title-bar h1.page-title {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin: 0;
+      flex: 1;
+      min-width: 0;
+    }
+    .search-form {
+      display: flex;
+      flex-shrink: 0;
+    }
+    .search-form input[type="text"] {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.82rem;
+      padding: 0.3rem 0.6rem;
+      border: 1px solid #d4b96a;
+      border-radius: 4px 0 0 4px;
+      background: #fdfcf9;
+      color: #2c2c2c;
+      width: 180px;
+      outline: none;
+      transition: border-color 0.15s;
+    }
+    .search-form input[type="text"]:focus {
+      border-color: #8b6914;
+    }
+    .search-form input[type="text"]::placeholder {
+      color: #bbb;
+    }
+    .search-form button {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.82rem;
+      padding: 0.3rem 0.6rem;
+      border: 1px solid #d4b96a;
+      border-left: none;
+      border-radius: 0 4px 4px 0;
+      background: #f5f0e4;
+      color: #8b6914;
+      cursor: pointer;
+      transition: background 0.15s;
+    }
+    .search-form button:hover {
+      background: #e8dfc8;
+    }
+
+    /* Search results */
+    .search-summary {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.85rem;
+      color: #888;
+      margin-bottom: 1.2rem;
+    }
+    .search-error {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.9rem;
+      color: #c44;
+      background: #fdf0f0;
+      border: 1px solid #f0c0c0;
+      border-radius: 6px;
+      padding: 0.8rem 1rem;
+      margin-bottom: 1.2rem;
+    }
+    .search-result {
+      margin-bottom: 1.5rem;
+    }
+    .search-result-path {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.9rem;
+      margin-bottom: 0.4rem;
+    }
+    .search-result-path a {
+      color: #8b6914;
+      text-decoration: none;
+    }
+    .search-result-path a:hover {
+      text-decoration: underline;
+    }
+    .search-result-path .icon {
+      margin-right: 0.3rem;
+    }
+    .search-context {
+      background: #2d2d2d;
+      color: #f0f0f0;
+      border-radius: 6px;
+      overflow: hidden;
+      font-family: "SF Mono", Menlo, Consolas, monospace;
+      font-size: 0.8rem;
+      line-height: 1.5;
+    }
+    .search-context-group {
+      padding: 0.4rem 0;
+    }
+    .search-context-group + .search-context-group {
+      border-top: 1px dashed #555;
+    }
+    .search-line {
+      display: flex;
+      padding: 0 0.8rem;
+      max-width: 100%;
+    }
+    .search-line-num {
+      color: #75715e;
+      text-align: right;
+      min-width: 3.5em;
+      padding-right: 1em;
+      flex-shrink: 0;
+      user-select: none;
+    }
+    .search-line-text {
+      flex: 1;
+      min-width: 0;
+      white-space: pre;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .search-line.match-line {
+      background: rgba(212, 185, 106, 0.15);
+    }
+    .search-line .highlight-match {
+      background: #b8860b;
+      color: #fff;
+      font-weight: 600;
+      padding: 0.05em 0.2em;
+      border-radius: 2px;
+    }
+    .search-line .truncated {
+      color: #75715e;
+      font-style: italic;
+    }
+    .search-line.ctx-2,
+    .search-line.ctx-3,
+    .search-line.ctx-4 {
+      display: none;
+    }
+    .search-no-results {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      font-size: 0.95rem;
+      color: #888;
+      text-align: center;
+      padding: 2rem 0;
+    }
+
     /* Responsive */
     @media (max-width: 768px) {
       .container { padding: 1rem; }
       .container.has-toc { max-width: 900px; }
       h1.page-title { font-size: 1.3rem; }
 
+      .title-bar {
+        flex-wrap: wrap;
+      }
+      .search-form input[type="text"] {
+        width: 140px;
+      }
+
       .page-with-toc { display: block; }
       .toc-sidebar { display: none; }
       .toc-mobile { display: block; }

data/views/markdown.erb

@@ -1,4 +1,11 @@
-<h1 class="page-title"><%= h(@title) %></h1>
+<% _parent = parent_dir_path(@crumbs.map { |c| c[:name] }.drop(1).join("/")) %>
+<div class="title-bar">
+  <h1 class="page-title"><%= h(@title) %></h1>
+  <form class="search-form" action="<%= search_form_path(_parent) %>" method="get">
+    <input type="text" name="q" placeholder="Search files..." value="">
+    <button type="submit">Search</button>
+  </form>
+</div>
 
 <div class="toolbar">
   <a href="<%= @download_href %>">Download</a>

data/views/raw.erb

@@ -1,4 +1,11 @@
-<h1 class="page-title"><%= h(@title) %></h1>
+<% _parent = parent_dir_path(@crumbs.map { |c| c[:name] }.drop(1).join("/")) %>
+<div class="title-bar">
+  <h1 class="page-title"><%= h(@title) %></h1>
+  <form class="search-form" action="<%= search_form_path(_parent) %>" method="get">
+    <input type="text" name="q" placeholder="Search files..." value="">
+    <button type="submit">Search</button>
+  </form>
+</div>
 
 <div class="toolbar">
   <a href="<%= @download_href %>">Download</a>

data/views/search.erb

@@ -0,0 +1,47 @@
+<div class="title-bar">
+  <h1 class="page-title">Search: <%= h(@title) %></h1>
+  <form class="search-form" action="<%= search_form_path(@path) %>" method="get">
+    <input type="text" name="q" placeholder="Search files..." value="<%= h(@query) %>">
+    <button type="submit">Search</button>
+  </form>
+</div>
+
+<% if @error %>
+  <div class="search-error"><%= h(@error) %></div>
+<% elsif !@query.empty? %>
+  <div class="search-summary">
+    <% if @results.empty? %>
+      No results for "<%= h(@query) %>"
+    <% else %>
+      <%= @results.length %><%= @results.length >= 100 ? "+" : "" %> file<%= @results.length == 1 ? "" : "s" %> matching "<%= h(@query) %>"
+    <% end %>
+  </div>
+<% end %>
+
+<% if @results.empty? && @error.nil? && !@query.empty? %>
+  <div class="search-no-results">No matching files found.</div>
+<% end %>
+
+<% @results.each do |result| %>
+  <div class="search-result">
+    <div class="search-result-path">
+      <span class="icon"><%= icon_for(File.basename(result[:path]), false) %></span>
+      <a href="/browse/<%= result[:path].split("/").map { |p| encode_path_component(p) }.join("/") %>"><%= h(result[:path]) %></a>
+    </div>
+    <% unless result[:matches].empty? %>
+      <div class="search-context">
+        <% result[:matches].each do |group| %>
+          <div class="search-context-group">
+            <% group[:lines].each do |line| %>
+              <% css_class = line[:distance] == 0 ? "search-line match-line" : "search-line ctx-#{line[:distance]}" %>
+              <div class="<%= css_class %>">
+                <span class="search-line-num"><%= line[:number] %></span>
+                <span class="search-line-text"><%= highlight_search_line(line[:text], @regexes, line[:distance] == 0) %></span>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Dunn
@@ -108,6 +108,7 @@ files:
 - views/layout.erb
 - views/markdown.erb
 - views/raw.erb
+- views/search.erb
 homepage: https://github.com/brianmd/markdown-server
 licenses:
 - MIT