jekyll-obsidian 1.1.2 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d080f763648a7d4d15eb6b5b65d41dc7e22c4f4030366fd7f11ab75a52b421ab
-  data.tar.gz: 4ef6b231668c6442cd2d36d7c595fe507f9a029ecd7767fe2997e6231416bb22
+  metadata.gz: 6db0db65249ec7386744cede3b75cba76663d178bd6c9ecba259c4c8dc1af477
+  data.tar.gz: 2c8fae8a7e9ec6c63c484417edc691a7090fd4ceca682ab643911430f024d24a
 SHA512:
-  metadata.gz: fc15afa41dec63f364dba5b3657ec499c8fbc95425964a71a781cad7305f4dfbe0d05923d0e42d94caf92e6127229933ca9cdd9290983351172a60c1fea2df41
-  data.tar.gz: '084533f538cb36977c5e4c24bc0bf988a9c736031a862d6c8a2829c5d88784e08506328d984b26279dddebbd89bcaabb98d6bb1fe3467533f37409f0cc03f920'
+  metadata.gz: 9a4cd05ebb9921e622e1a5ca0c45d54e2a6d8e62f8d7f8eda9e8f5d2b0e18224e8a941177281b6e1facb98fc4af1ecfe23938315be7d5dac92742a05bf94fddb
+  data.tar.gz: 27223fc85608f08520f5f92b3ef9f6046424bd48cec8cdf47f485821a9790c3f51dac5c16b5e86899f8626d659e2bcf119a0b2e34f314bd00e73eb7dddba2d1d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [1.1.8] - 2025-01-09
+- Strings of file links in File Search are formatted similar to native app 
+
+## [1.1.3] - 2025-01-09
+- Fixed embeds with consecutive trailing periods
+
 ## [1.1.2] - 2024-09-13
 - Fixed duplicate linked mentions
 - Added text color to linked mention

data/README.md

@@ -63,7 +63,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
     ```
 6. Run `bundle install` or `bundle update jekyll-obsidian`, if you already installed it
 
-7. Run `bundle exec jekyll build` to generate the necessary `.css` and `.json` files, and convert all your `.md` notes to `.mdnote`.
+7. Run `bundle exec jekyll build` to generate the necessary `.css` and `.json` files, and convert all your `.md` notes to `.mdj`.
 
 8. Run `bundle exec jekyll serve`, you should now see your Obsidian page at your given permalink
 

data/assets/css/partials/_modals.scss

@@ -25,8 +25,8 @@
             }
 
             @media (min-width:1281px) {
-                min-width: 0;
-                max-width: 30%;
+                min-width: 40%;
+                max-width: 80%;
             }
         }
 
@@ -172,9 +172,8 @@
         #media-modal {
             width: max-content;
             height: max-content;
-            min-width: max-content;
-            max-width: 80% !important;
-            max-height: 80% !important;
+            max-width: 84%;
+            max-height: 84%;
 
             #media {
 

data/assets/includes/fileread.html

@@ -93,7 +93,7 @@
             if (index === filePathArr.length - 1) {
                 btn.textContent = extractFilenameFromPath(path);
                 btn.addEventListener('click', () => {
-                    if (filePath.endsWith('.mdnote'))
+                    if (filePath.endsWith('.mdj'))
                         FILEREAD.scrollTop = 0;
                     else if (filePath.endsWith('.canvas'))
                         resetCanvasPosition();
@@ -146,7 +146,6 @@
 
     function generateCallouts(calloutsArr, cleanedHTML) {
         calloutsArr.forEach(callout => {
-            // Extract the callout type including square brackets, removing "> " part
             const calloutType = callout.slice(2).trim().toLowerCase();
             console.log("calloutType: " + calloutType);
             let svgString = '';
@@ -211,9 +210,9 @@
             const embedsParsed = JSON.parse(embeds.replace(/"/g, '"'));
             embedsArr.forEach(embed => {
                 const fileNameMatch = embed.match(/\[\[(.*?)\]\]/);
-                console.log("fileNameMatch: " + fileNameMatch);
                 if (fileNameMatch) {
                     const fileName = extractFilenameFromPath(fileNameMatch[1]);
+                    console.log("fileNameMatch: " + fileNameMatch + " embed " + embed);
                     for (let key in embedsParsed) {
                         const embedFileName = extractFilenameFromPath(key);
                         if (embedFileName.replace("/:|", "'") === fileName) {
@@ -316,7 +315,7 @@
     function dispatchFileSelectEvt(filePath, heading) {
         const EXPLORER = OBSIDIAN.querySelector('#explorer');
         const detail = { filePath };
-        if (filePath.endsWith('.mdnote')) {
+        if (filePath.endsWith('.mdj')) {
             if (heading) detail.heading = heading;
             const event = new CustomEvent('obsidian_noteSelect', { detail });
             document.dispatchEvent(event);

data/assets/includes/modals.html

@@ -20,8 +20,9 @@
             ×
         </button>
         <p><a href="https://github.com/khiemgluong/jekyll-obsidian" target="_blank">jekyll-obsidian</a></p>
-        <p>View <a href="https://obsidian.md/" target="_blank">Obsidian</a> vaults, on your <a
-                href="https://jekyllrb.com/" target="_blank">Jekyll</a> website.</p>
+        <p>View <a href="https://obsidian.md/" target="_blank">Obsidian</a>
+            vaults, on your <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>
+            website.</p>
 
         <span>Color scheme</span>
         <select id="color-scheme">
@@ -203,21 +204,25 @@
 <script>
     function generateSearchModalFilepaths(vaultFiles, ul) {
         vaultFiles.forEach(child => {
-            if (child.type === 'dir') {
+            if (child.type === 'dir')
                 generateSearchModalFilepaths(child.children, ul);
-            }
             if (child.type === 'file') {
                 const li = document.createElement('li');
                 const button = document.createElement('button');
                 const decodedString = he.decode(child.path);
-                // if (decodedString.endsWith('.mdnote')) {
-                //     button.textContent = decodedString.slice(0, -4);
-                // } else 
-                button.textContent = decodedString;
+
+                switch (getFileType(child.path)) {
+                    case "note":
+                        button.textContent = decodedString.replace(/\.[^/.]+$/, "");
+                        break;
+                    default:
+                        button.textContent = decodedString;
+                        break;
+                }
+                button.textContent = button.textContent.slice(1);
                 button.addEventListener('click', () => {
-                    const searchModal = MODALS.querySelector('#search-modal');
                     dispatchFileSelectEvt(decodedString);
-                    searchModal.hidePopover();
+                    MODALS.querySelector('#search-modal').hidePopover();
                 });
                 li.appendChild(button); ul.appendChild(li);
             }

data/assets/includes/note.html

@@ -79,7 +79,7 @@
         for (const parsedFilePath in backlinks_parsed) {
             const entry = backlinks_parsed[parsedFilePath];
             entry.backlink_paths.forEach(path => {
-                if (path === filePath && parsedFilePath.endsWith('.mdnote')) {
+                if (path === filePath && parsedFilePath.endsWith('.mdj')) {
                     linked_mentions.push(parsedFilePath.replace("/:|", "'"));
                 }
             });
@@ -157,9 +157,8 @@
             let homepage = '{{ site.obsidian_homepage | escape }}';
             if (homepage) {
                 if (homepage.endsWith('.md'))
-                    homepage = homepage.replace('.md', '.mdnote');
-
-                if (homepage.endsWith('.mdnote')) {
+                    homepage = homepage.replace('.md', '.mdj');
+                if (homepage.endsWith('.mdj')) {
                     switchPage(homepage);
                     loadNote(homepage);
                     console.log("note loaded: " + homepage);

data/assets/includes/sidebar.html

@@ -1,22 +1,28 @@
 <body>
     <div id="top-container">
         <button id="homepage" onclick="loadHomepage()">
-            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
+            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
+                width="24" height="24" fill="none"
                 viewBox="0 0 24 24">
-                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
+                <path stroke="currentColor" stroke-linecap="round"
+                    stroke-linejoin="round" stroke-width="1.5"
                     d="m4 12 8-8 8 8M6 10.5V19a1 1 0 0 0 1 1h3v-3a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v3h3a1 1 0 0 0 1-1v-8.5" />
             </svg>
         </button>
-        <button id="search" onclick="dispatchModalSelectEvt('search')" popovertarget="search-modal">
-            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none"
+        <button id="search" onclick="dispatchModalSelectEvt('search')"
+            popovertarget="search-modal">
+            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
+                width="22" height="22" fill="none"
                 viewBox="0 0 24 24">
-                <path stroke="currentColor" stroke-linecap="round" stroke-width="2"
+                <path stroke="currentColor" stroke-linecap="round"
+                    stroke-width="2"
                     d="m21 21-3.5-3.5M17 10a7 7 0 1 1-14 0 7 7 0 0 1 14 0Z" />
             </svg>
 
         </button>
         <button id="tags" onclick="dispatchModalSelectEvt('tags')">
-            <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" viewBox="0 0 16 16">
+            <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"
+                fill="currentColor" viewBox="0 0 16 16">
                 <path
                     d="M3 2v4.586l7 7L14.586 9l-7-7zM2 2a1 1 0 0 1 1-1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 2 6.586z" />
                 <path
@@ -25,10 +31,13 @@
         </button>
     </div>
     <div id="bottom-container">
-        <button id="info" onclick="dispatchModalSelectEvt('info')" popovertarget="info-modal">
-            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
+        <button id="info" onclick="dispatchModalSelectEvt('info')"
+            popovertarget="info-modal">
+            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
+                width="24" height="24" fill="none"
                 viewBox="0 0 24 24">
-                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                <path stroke="currentColor" stroke-linecap="round"
+                    stroke-linejoin="round" stroke-width="2"
                     d="M10 11h2v5m-2 0h4m-2.592-8.5h.01M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
             </svg>
         </button>
@@ -40,8 +49,9 @@
         let homepage = '{{ site.obsidian_homepage | escape }}';
         if (homepage) {
             if (homepage.endsWith('.md'))
-                homepage = homepage.replace('.md', '.mdnote');
-            if (homepage.endsWith('.mdnote')) {
+                homepage = homepage.replace('.md', '.mdj');
+            if (homepage.endsWith('.mdj'))
+            {
                 switchPage(homepage);
                 loadNote(homepage);
             }

data/assets/layouts/obsidian.html

@@ -3,7 +3,7 @@
 
 <head>
     <script src="https://cdn.jsdelivr.net/npm/he@latest/he.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.1.6/purify.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.2.3/purify.min.js"></script>
     <script src=" https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.min.js "></script>
     <link rel="stylesheet" href="{{ '/assets/obsidian/obsidian.css' | relative_url }}">
     <style>
@@ -152,6 +152,10 @@
 
     function getFileType(filePath) {
         const extensionToType = {
+            // Notes
+            'mdj': 'note', 'txt': 'note',
+            // Canvas
+            'canvas': 'canvas',
             // Images
             'jpg': 'image', 'jpeg': 'image', 'png': 'image', 'gif': 'image', 'bmp': 'image', 'webp': 'image',
             // PDFs

data/lib/jekyll/obsidian/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Obsidian
-    VERSION = "1.1.2"
+    VERSION = "1.1.8"
   end
 end

data/lib/jekyll/obsidian.rb

@@ -9,14 +9,6 @@ require_relative "obsidian/version"
 
 module Jekyll
   module Obsidian
-    # Jekyll::Hooks.register :site, :post_write do |site|
-    #   vault = site.config["obsidian_vault"]
-    #   vault_path = File.join(site.dest, vault)
-    #   Dir.glob(File.join(vault_path, "**", "*.md")).each do |md_file|
-    #     new_file_path = md_file.sub(/\.md$/, ".mdnote")
-    #     File.rename(md_file, new_file_path)
-    #   end
-    # end
     class FileTreeGenerator < Jekyll::Generator
       safe true
       priority :lowest
@@ -101,7 +93,7 @@ module Jekyll
             puts "#{File.basename(file)} currently exists"
           else
             FileUtils.cp(file, dir)
-            puts "#{File.basename(file)} copied over"
+            # puts "#{File.basename(file)} copied over"
           end
         else
           puts "Error: #{file} does not exist"
@@ -140,13 +132,27 @@ module Jekyll
             next if File.zero?(entry_path) || File.empty?(entry_path)
 
             if File.extname(entry) == ".md"
-              new_name = entry.sub(".md", ".mdnote")
+              new_name = entry.sub(".md", ".mdj")
+              # convert markdown to markdownjekyll files
               new_path = File.join(rootdir, new_name)
               File.rename(entry_path, new_path)
               entry_path = new_path
               entry = new_name
             end
 
+            if /\.\./.match?(entry) # Checks for two or more consecutive periods
+              base_name = File.basename(entry, File.extname(entry)).gsub(/\.{2,}/, ".")
+              base_name = base_name.chomp(".")
+              trimmed_name = base_name.chomp(".") + File.extname(entry)
+              puts "file path: #{trimmed_name} #{entry}"
+              if trimmed_name != entry
+                new_path = File.join(rootdir, trimmed_name)
+                File.rename(entry_path, new_path)
+                entry_path = new_path
+                entry = trimmed_name
+              end
+            end
+
             counts[:files] += 1
             counts[:size] += File.size(entry_path)
             {name: entry, type: "file", path: File.join(path, entry), size: File.size(entry_path)}
@@ -162,9 +168,10 @@ module Jekyll
           elsif file[:type] == "file"
             entry_path = File.join(rootdir, file[:path])
             next if File.zero?(entry_path) || excluded_file_exts(file[:name])
-            if file[:name].end_with?(".mdnote", ".canvas")
+            if file[:name].end_with?(".mdj", ".canvas")
               begin
                 content = File.read(entry_path)
+                updated = false
               rescue Errno::ENOENT
                 puts "Error reading file: #{entry_path} - No such file"
                 next
@@ -174,12 +181,9 @@ module Jekyll
               end
 
               links = content.scan(/\[\[(.*?)\]\]/).flatten
-
               backlinks[file[:path]] ||= {"backlink_paths" => []}
-
               links.each do |link|
-                lowercase_link = link.downcase
-                matched_entry = find_matching_entry(root_files, lowercase_link)
+                matched_entry = find_matching_entry(root_files, link.downcase)
                 if matched_entry
                   unless matched_entry[:path] == file[:path] ||
                       backlinks[file[:path]]["backlink_paths"].include?(matched_entry[:path])
@@ -187,14 +191,29 @@ module Jekyll
                   end
                 end
               end
-            elsif !file[:name].end_with?(".mdnote", ".canvas")
-              if embeds[file[:path]].nil? || embeds[file[:path]]["embed_paths"].nil?
-                embeds[file[:path]] = {"embed_paths" => [entry_path]}
-              else
-                unless embeds[file[:path]]["embed_paths"].include?(entry_path)
-                  embeds[file[:path]]["embed_paths"] << entry_path
+
+              embeds_ = content.scan(/!\[\[(.*?)\]\]/).flatten
+              embeds_.each do |embed|
+                if /\.\./.match?(embed)
+                  base_name = File.basename(embed, File.extname(embed)).gsub(/\.\.+/, ".")
+                  base_name = base_name.chomp(".")
+                  trimmed_name = base_name + File.extname(embed)
+                  content = content.gsub("![[#{embed}]]", "![[#{trimmed_name}]]")
+                  puts("trimmed_name #{trimmed_name} #{content}")
+                  updated = true
                 end
               end
+              if updated
+                File.write(entry_path, content)
+                puts "Updated file: #{entry_path}"
+              end
+
+            elsif embeds[file[:path]].nil? || embeds[file[:path]]["embed_paths"].nil?
+              embeds[file[:path]] = {"embed_paths" => [entry_path]}
+            else
+              unless embeds[file[:path]]["embed_paths"].include?(entry_path)
+                embeds[file[:path]]["embed_paths"] << entry_path
+              end
             end
           else
             puts "Skipping non-markdown file: #{file[:name]}"
@@ -209,7 +228,7 @@ module Jekyll
           if file[:type] == "dir"
             result = find_matching_entry(file[:children], lowercase_link)
             return result if result
-          elsif file[:type] == "file" && file[:name].end_with?(".mdnote", ".canvas")
+          elsif file[:type] == "file" && file[:name].end_with?(".mdj", ".canvas")
             file_name_without_extension = file[:name].sub(/\.\w+$/, "").downcase
             return file if file_name_without_extension == stripped_link
           end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-obsidian
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.8
 platform: ruby
 authors:
 - Khiem Luong
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -81,7 +80,6 @@ metadata:
   homepage_uri: https://khiemgluong.github.io/blade-ballad/
   source_code_uri: https://github.com/khiemgluong/jekyll-obsidian/
   changelog_uri: https://github.com/khiemgluong/jekyll-obsidian/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Obsidian integration for Jekyll
 test_files: []