hyde_admin 0.0.13 → 0.0.14

data/bin/hyde_admin.ru

@@ -5,7 +5,8 @@ require 'yaml'
 require 'fileutils'
 require 'i18n'
 require 'date'
-require 'escape_utils'
+require 'cgi'
+require 'shellwords'
 require 'image_processing/mini_magick'
 require_relative '../lib/hyde_admin/version'
 
@@ -37,14 +38,14 @@ class Mid < Roda
     if !File.exist?(yml_in_current_dir)
       FileUtils.cp(yml_in_gem, yml_in_current_dir)
     end
-    @hyde_parameters ||= YAML.load(File.read(yml_in_current_dir))
+    @hyde_parameters ||= YAML.safe_load(File.read(yml_in_current_dir), permitted_classes: [Date, Time])
 
     super(param)
   end
 
   def self.transliterate_title_for_url(title)
     I18n.config.available_locales = :en
-    I18n.transliterate(title).downcase.gsub(/[^a-zA-Z ]/,'').gsub(' ','-')
+    I18n.transliterate(title).downcase.gsub(/[^a-zA-Z0-9 ]/,'').strip.gsub(/\s+/,'-').gsub(/-+/,'-').chomp('-')
   end
 
   def self.urlize(date_str, title, with_date = true)
@@ -62,7 +63,7 @@ class Mid < Roda
 
   def self.extract_header(str)
     headers = Mid.extract_header_str(str).to_s.split("\n")
-    headers = headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z0-9]*): (.*)/).flatten }.select{ |header| !header.empty? }
+    headers = headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z0-9_-]+): (.*)/).flatten }.select{ |header| !header.empty? }
     hsh_headers = {}
     if !headers.flatten.empty?
       #$stderr.puts "==============="
@@ -80,6 +81,10 @@ class Mid < Roda
     File.expand_path(File.dirname(__FILE__))
   end
 
+  def self.safe_path?(path)
+    File.expand_path(path).start_with?(Dir.pwd)
+  end
+
   def self.extract_tags(str)
     str.to_s.scan(/^\[?(.*?)\]?$/).flatten.first.split(',')
   end
@@ -112,6 +117,7 @@ class Mid < Roda
 
   route do |r|
     @page = r.params['page']
+    @notice = r.params['notice']
 
     if @hyde_parameters['hyde_admin_auth'].to_s == 'true'
       http_auth {|u, p| [u, p] == [@hyde_parameters['hyde_admin_user'], @hyde_parameters['hyde_admin_password']] }
@@ -134,13 +140,46 @@ class Mid < Roda
     # Rebuild static files
     r.on "rebuild" do
       $stderr.puts Dir.pwd
-      $stderr.puts `cd #{Dir.pwd} && jekyll b`
-      r.redirect "/dashboard"
+      $stderr.puts `cd #{Shellwords.escape(Dir.pwd)} && jekyll b`
+      r.redirect "/dashboard?notice=#{CGI.escape(t.rebuild + ' OK')}"
     end
 
     r.on "deploy" do
-      `#{@hyde_parameters['rsync_fullpath']} -avzr #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
-      r.redirect "/dashboard"
+      `#{Shellwords.escape(@hyde_parameters['rsync_fullpath'])} -avzr #{Shellwords.escape("#{Dir.pwd}/_site/")} #{Shellwords.escape(@hyde_parameters['deploy_dest_user'])}@#{Shellwords.escape(@hyde_parameters['deploy_dest_address'])}:#{Shellwords.escape(@hyde_parameters['deploy_dest_path'])}`
+      r.redirect "/dashboard?notice=#{CGI.escape(t.deploy + ' OK')}"
+    end
+
+    r.on "deploy_sftp" do
+      site_dir = "#{Dir.pwd}/_site"
+      sftp_user = @hyde_parameters['sftp_user']
+      sftp_host = @hyde_parameters['sftp_host']
+      sftp_port = @hyde_parameters['sftp_port'].to_s.empty? ? '22' : @hyde_parameters['sftp_port']
+      sftp_path = @hyde_parameters['sftp_dest_path']
+      sftp_password = @hyde_parameters['sftp_password']
+
+      batch_commands = []
+      Dir.glob("#{site_dir}/**/*").each do |local_path|
+        relative = local_path.sub("#{site_dir}/", '')
+        remote = "#{sftp_path}/#{relative}"
+        if File.directory?(local_path)
+          batch_commands << "-mkdir #{Shellwords.escape(remote)}"
+        else
+          batch_commands << "put #{Shellwords.escape(local_path)} #{Shellwords.escape(remote)}"
+        end
+      end
+
+      batch_file = File.join(Dir.pwd, '.sftp_batch')
+      File.write(batch_file, batch_commands.join("\n"))
+
+      sftp_cmd = "sftp -P #{Shellwords.escape(sftp_port)} -b #{Shellwords.escape(batch_file)}"
+      if !sftp_password.to_s.empty?
+        sftp_cmd = "sshpass -p #{Shellwords.escape(sftp_password)} #{sftp_cmd}"
+      end
+      sftp_cmd += " #{Shellwords.escape(sftp_user)}@#{Shellwords.escape(sftp_host)}"
+
+      `#{sftp_cmd}`
+      File.delete(batch_file) if File.exist?(batch_file)
+      r.redirect "/dashboard?notice=#{CGI.escape(t.deploy_sftp + ' OK')}"
     end
 
     r.post "configuration" do
@@ -151,7 +190,7 @@ class Mid < Roda
       File.open(File.join(Dir.pwd, YML_FILE_NAME),"w+") do |f|
         f.write(@hyde_parameters.to_yaml)
       end
-      r.redirect "/configuration"
+      r.redirect "/configuration?notice=#{CGI.escape(t.configuration + ' OK')}"
     end
 
     r.get "configuration" do
@@ -162,6 +201,79 @@ class Mid < Roda
       view("dashboard")
     end
 
+    r.get "search" do
+      @query = (r.params['q'] || '').strip
+      @results = []
+
+      if @query.length >= 2
+        normalized_query = @query.unicode_normalize(:nfkd).gsub(/\p{Mn}/, '').downcase
+
+        %w[_posts _pages _drafts].each do |dir|
+          type_name = dir.sub('_', '')
+          dir_path = File.join(Dir.pwd, dir)
+          next unless File.directory?(dir_path)
+
+          Dir.glob(File.join(dir_path, '**', '*')).select { |f| File.file?(f) }.each do |f|
+            content = File.read(f, encoding: 'utf-8') rescue next
+            headers = Mid.extract_header(content)
+            body = Mid.remove_header(content)
+            relative = f.gsub(File.join(Dir.pwd, ''), '')
+            searchable = [
+              File.basename(f),
+              headers['title'].to_s,
+              headers['tags'].to_s,
+              body.to_s[0, 500]
+            ].join(' ').unicode_normalize(:nfkd).gsub(/\p{Mn}/, '').downcase
+
+            if searchable.include?(normalized_query)
+              excerpt = nil
+              body_normalized = body.to_s.unicode_normalize(:nfkd).gsub(/\p{Mn}/, '').downcase
+              pos = body_normalized.index(normalized_query)
+              if pos
+                start = [pos - 60, 0].max
+                excerpt = body.to_s[start, 150].gsub(/\s+/, ' ').strip
+                excerpt = "...#{excerpt}..." if start > 0
+              end
+
+              @results << {
+                type: type_name,
+                path: f,
+                relative: relative,
+                title: headers['title'].to_s.empty? ? File.basename(f) : headers['title'],
+                tags: headers['tags'].to_s,
+                excerpt: excerpt,
+                edit_url: "/#{type_name}?file=#{CGI.escape(f)}"
+              }
+            end
+          end
+        end
+
+        # Search in files (root directory, excluding _ dirs and _site)
+        Dir.glob(File.join(Dir.pwd, '**', '*')).select { |f|
+          File.file?(f) &&
+          !f.include?('/_') &&
+          !f.include?('/_site') &&
+          !f.start_with?(File.join(Dir.pwd, '_'))
+        }.each do |f|
+          relative = f.gsub(File.join(Dir.pwd, ''), '')
+          searchable = File.basename(f).unicode_normalize(:nfkd).gsub(/\p{Mn}/, '').downcase
+          if searchable.include?(normalized_query)
+            @results << {
+              type: 'files',
+              path: f,
+              relative: relative,
+              title: File.basename(f),
+              tags: '',
+              excerpt: nil,
+              edit_url: "/files/edit?dir_path=#{CGI.escape(File.dirname(f))}&file=#{CGI.escape(f)}"
+            }
+          end
+        end
+      end
+
+      view("search")
+    end
+
     r.on "upload_image_form" do
       render("upload_image_form")
     end
@@ -171,8 +283,12 @@ class Mid < Roda
       @filenames = []
       files.each do |file|
         filename = file[:filename]
+        ext = File.extname(filename)
+        base = File.basename(filename, ext)
+        counter = 1
         while File.exist?(File.join(@hyde_parameters['images_path'], filename))
-          filename = "#{File.basename(filename, File.extname(filename))}_#{File.extname(filename)}"
+          filename = "#{base}_#{counter}#{ext}"
+          counter += 1
         end
         @filenames << filename
         File.open(File.join(@hyde_parameters['images_path'], filename), 'wb') do |f|
@@ -187,6 +303,7 @@ class Mid < Roda
 
     r.on "files" do
       @dir_path = r.params['dir_path'] || Dir.pwd
+      response.status = 403 and next unless Mid.safe_path?(@dir_path)
 
       # List files
       r.get "index" do
@@ -225,6 +342,7 @@ class Mid < Roda
       # Edit text files
       r.get "edit" do
         @file = r.params['file']
+        response.status = 403 and next unless Mid.safe_path?(@file)
         @content = File.read(@file)
         @header = Mid.extract_header_str(@content)
         @content = Mid.remove_header(@content)
@@ -236,6 +354,7 @@ class Mid < Roda
       # Update file
       r.post "update" do
         @file = r.params['file']
+        response.status = 403 and next unless Mid.safe_path?(@file)
         @content = r.params['content']
         @header = r.params['header']
         File.open(@file,"w+") do |f|
@@ -253,7 +372,12 @@ class Mid < Roda
       # Delete
       r.post "delete" do
         file = r.params['file']
-        File.unlink(file)
+        response.status = 403 and next unless Mid.safe_path?(file)
+        if File.directory?(file)
+          FileUtils.rm_rf(file) if Dir[File.join(file, '*')].empty?
+        else
+          File.unlink(file)
+        end
         r.redirect "/files/index?dir_path=#{@dir_path}"
       end
     end
@@ -276,6 +400,34 @@ class Mid < Roda
         date = Time.now.strftime(FORMAT_DATE_INPUT_FILENAME)
         response.write(date)
       end
+      r.post "preview" do
+        content = r.params['content']
+        title = r.params['title']
+        date = r.params['date']
+        layout = r.params['layout']
+        tags = r.params['tags']
+        format = r.params['format'] || 'md'
+
+        headers = ["---"]
+        headers << "title: #{title}" unless title.to_s.empty?
+        headers << "date: #{date}" unless date.to_s.empty?
+        headers << "layout: #{layout}" unless layout.to_s.empty?
+        headers << "tags: #{tags}" unless tags.to_s.empty?
+        headers << "---"
+        headers << ""
+
+        preview_file = File.join(Dir.pwd, "hyde-preview-tmp.#{format}")
+        File.open(preview_file, "w+") do |f|
+          f.write(headers.join("\n"))
+          f.write(content)
+        end
+
+        `cd #{Shellwords.escape(Dir.pwd)} && jekyll b 2>&1`
+
+        File.delete(preview_file) if File.exist?(preview_file)
+
+        response.write("/hyde-preview-tmp.html?t=#{Time.now.to_i}")
+      end
       r.post "images" do
         nb_elements_per_page = 9
 
@@ -325,6 +477,7 @@ class Mid < Roda
       # save the truc post
       r.post "delete" do
         @file = r.params['file']
+        response.status = 403 and next unless Mid.safe_path?(@file)
         File.unlink(@file)
         r.redirect "/#{@type_file}/index?dir_path=#{File.dirname(@file)}"
       end
@@ -334,6 +487,7 @@ class Mid < Roda
         # edit the truc post
         r.get do
           @file = r.params['file']
+          response.status = 403 and next unless Mid.safe_path?(@file)
 
           content_file = File.read(@file)
           @headers = Mid.extract_header(content_file)

data/bin/hyde_assets/hyde_admin.css

@@ -41,11 +41,69 @@
     max-width: 90vw;
 }
 
+#autosave-indicator {
+    display: inline-block;
+    margin-left: 12px;
+    font-size: 0.85em;
+    color: #6c757d;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+#autosave-indicator.visible {
+    opacity: 1;
+}
+
 .CodeMirror{
     border: 1px solid #ced4da;
     border-radius: 4px;
 }
 
+/* Preview split-screen */
+#preview-wrapper.preview-active {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - 56px);
+}
+#preview-wrapper.preview-active #editor-panel {
+    flex: 1;
+    overflow-y: auto;
+    min-height: 0;
+    padding-right: 8px;
+}
+#preview-wrapper.preview-active #preview-panel {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    border-top: 2px solid #dee2e6;
+}
+#preview-panel .preview-panel-header {
+    flex-shrink: 0;
+}
+#preview-iframe {
+    flex: 1;
+    width: 100%;
+    height: 100%;
+    border: none;
+    min-height: 0;
+}
+main.preview-active-main {
+    padding: 8px !important;
+    overflow: hidden;
+}
+@media (min-width: 1900px) {
+    #preview-wrapper.preview-active {
+        flex-direction: row;
+    }
+    #preview-wrapper.preview-active #editor-panel {
+        width: 50%;
+    }
+    #preview-wrapper.preview-active #preview-panel {
+        border-top: none;
+        border-left: 2px solid #dee2e6;
+    }
+}
+
 /* hyde admin style */
 .sidebarMenu-logo{
     width: 144px;

data/bin/hyde_assets/hyde_admin.js

@@ -1,24 +1,127 @@
-$(function(){
-    $(document).on('click','#btn-deploy,#btn-rebuild',function(elt){
-        let path = '';
-
-        if(elt.id === 'btn-deploy'){
+document.addEventListener('DOMContentLoaded', function(){
+    document.addEventListener('click', function(e){
+        var btn = e.target.closest('#btn-deploy, #btn-rebuild');
+        if(!btn) return;
+        e.preventDefault();
+        var path = '';
+        if(btn.id === 'btn-deploy'){
             path = '/deploy';
-        }else if(elt.id === 'btn-rebuild'){
+        }else if(btn.id === 'btn-rebuild'){
             path = '/rebuild';
         }
-
-        $.post( path, {
-            beforeSend: function( xhr ) {
-                $('#waiting').show();
-            }
-        })
-            .done(function( data ) {
-                $('#waiting').hide();
-                return false;
+        document.getElementById('waiting').style.display = 'block';
+        fetch(path, { method: 'POST' })
+            .finally(function() {
+                document.getElementById('waiting').style.display = 'none';
             });
     });
-    $(document).on('click','.form-confirm',function(){
-        return window.confirm($(this).attr('data-confirm'));
+    document.addEventListener('submit', function(e){
+        var form = e.target.closest('.form-confirm');
+        if(!form) return;
+        if(!window.confirm(form.getAttribute('data-confirm'))){
+            e.preventDefault();
+        }
     });
-});
+
+    // Autosave
+    var autosaveForm = document.querySelector('form[data-autosave-key]');
+    if (autosaveForm) {
+        var autosaveKey = autosaveForm.getAttribute('data-autosave-key');
+        var autosaveInterval = 15000;
+        var autosaveTimer = null;
+        var autosaveFields = ['i-title', 'i-date', 'i-tags'];
+
+        function autosaveGetContent() {
+            if (window.myCodeMirror) return window.myCodeMirror.getValue();
+            var ta = document.getElementById('i-content');
+            return ta ? ta.value : '';
+        }
+
+        function autosaveSetContent(val) {
+            if (window.myCodeMirror) { window.myCodeMirror.setValue(val); return; }
+            var ta = document.getElementById('i-content');
+            if (ta) ta.value = val;
+        }
+
+        function autosaveCollect() {
+            var data = { _ts: Date.now() };
+            autosaveFields.forEach(function(id) {
+                var el = document.getElementById(id);
+                if (el) data[id] = el.value;
+            });
+            var layoutEl = autosaveForm.querySelector('select[name="layout"]');
+            if (layoutEl) data['layout'] = layoutEl.value;
+            data['content'] = autosaveGetContent();
+            return data;
+        }
+
+        function autosaveSave() {
+            try {
+                localStorage.setItem(autosaveKey, JSON.stringify(autosaveCollect()));
+                var ind = document.getElementById('autosave-indicator');
+                if (ind) {
+                    ind.classList.add('visible');
+                    setTimeout(function() { ind.classList.remove('visible'); }, 2000);
+                }
+            } catch(e) {}
+        }
+
+        function autosaveRestore(data) {
+            autosaveFields.forEach(function(id) {
+                var el = document.getElementById(id);
+                if (el && data[id] !== undefined) el.value = data[id];
+            });
+            var layoutEl = autosaveForm.querySelector('select[name="layout"]');
+            if (layoutEl && data['layout']) layoutEl.value = data['layout'];
+            if (data['content'] !== undefined) autosaveSetContent(data['content']);
+        }
+
+        function autosaveShowBanner(data) {
+            var banner = document.getElementById('autosave-banner');
+            if (!banner) return;
+            var dateStr = new Date(data._ts).toLocaleString();
+            document.getElementById('autosave-banner-text').textContent =
+                'Autosaved draft from ' + dateStr;
+            banner.classList.remove('d-none');
+
+            document.getElementById('autosave-restore').addEventListener('click', function() {
+                autosaveRestore(data);
+                banner.classList.add('d-none');
+            });
+            document.getElementById('autosave-discard').addEventListener('click', function() {
+                localStorage.removeItem(autosaveKey);
+                banner.classList.add('d-none');
+            });
+        }
+
+        function autosaveInit() {
+            try {
+                var raw = localStorage.getItem(autosaveKey);
+                if (raw) {
+                    var data = JSON.parse(raw);
+                    if (Date.now() - data._ts < 7 * 24 * 3600 * 1000) {
+                        autosaveShowBanner(data);
+                    } else {
+                        localStorage.removeItem(autosaveKey);
+                    }
+                }
+            } catch(e) { localStorage.removeItem(autosaveKey); }
+
+            autosaveTimer = setInterval(autosaveSave, autosaveInterval);
+
+            autosaveForm.addEventListener('submit', function() {
+                localStorage.removeItem(autosaveKey);
+                if (autosaveTimer) clearInterval(autosaveTimer);
+            });
+        }
+
+        // Wait for CodeMirror to be ready
+        (function waitCM(attempts) {
+            if (window.myCodeMirror || attempts <= 0) {
+                autosaveInit();
+            } else {
+                setTimeout(function() { waitCM(attempts - 1); }, 100);
+            }
+        })(20);
+    }
+});

data/bin/i18n/en.yml

@@ -44,6 +44,17 @@ deploy_dest_path: deploy remote path
 help_deploy_dest_path: remote path on disk for ssh deployment
 rsync_fullpath: rsync path
 help_rsync_fullpath: if rsync is not in PATH, othervise just let 'rsync'
+deploy_sftp: deploy SFTP
+sftp_user: SFTP user
+help_sftp_user: SFTP user for connection
+sftp_host: SFTP host
+help_sftp_host: SFTP server hostname or IP address
+sftp_port: SFTP port
+help_sftp_port: SFTP port (default 22)
+sftp_dest_path: SFTP remote path
+help_sftp_dest_path: remote path on the SFTP server for deployment
+sftp_password: SFTP password
+help_sftp_password: SFTP password (leave empty to use SSH key authentication)
 site_index: index file name of site
 help_site_index: link to open when we click on overview
 hyde_admin_language: hyde admin language
@@ -110,4 +121,12 @@ help_resize_size: Downsize to fit to the specified size (resize preserve ratio),
 resize_enable: Enable resizing for images
 help_resize_enable: enable feature resize image at upload
 text_editor_maximized: enable maximised editor
-help_text_editor_maximized: permet d'agrandir l'éditeur au maximum du contenu
+help_text_editor_maximized: expand the editor to the maximum of the content
+global_search: search
+global_search_placeholder: search posts, pages, files...
+global_search_no_results: no results
+global_search_results_for: results for
+editor_preview: Preview
+preview_building: Building preview...
+preview_close: Close preview
+preview_refresh: Refresh preview

data/bin/i18n/fr.yml

@@ -44,6 +44,17 @@ deploy_dest_path: chemin distant pour déploiement
 help_deploy_dest_path: chemin distant pour déploiement du site
 rsync_fullpath: chemin rsync
 help_rsync_fullpath: si rsync n'est pas dans le PATH, sinon laissez 'rsync'
+deploy_sftp: déployer SFTP
+sftp_user: utilisateur SFTP
+help_sftp_user: utilisateur pour la connexion SFTP
+sftp_host: hôte SFTP
+help_sftp_host: nom de domaine ou adresse IP du serveur SFTP
+sftp_port: port SFTP
+help_sftp_port: port SFTP (par défaut 22)
+sftp_dest_path: chemin distant SFTP
+help_sftp_dest_path: chemin distant sur le serveur SFTP pour le déploiement
+sftp_password: mot de passe SFTP
+help_sftp_password: mot de passe SFTP (laisser vide pour utiliser l'authentification par clé SSH)
 site_index: nom du fichier index pour le site
 help_site_index: Lien pour le lien aperçu, pensez à l'extention si nécessaire
 hyde_admin_language: hyde admin langue
@@ -91,7 +102,7 @@ parent_dir: dossier parent
 sort_by_date: tri par date
 older: vieille d'abord
 newer: récente d'abord
-previous_images: images précédentes " lol
+previous_images: images précédentes
 next_images: images suivantes
 search: recherche
 filename: nom de fichier
@@ -110,4 +121,12 @@ help_resize_size: Réduit les image pour coller à la taille spécifiée (le red
 resize_enable: activer redimensionnement
 help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload
 text_editor_maximized: activer l'editeur maximisé
-help_text_editor_maximized: permet d'agrandir l'éditeur au maximum du contenu
+help_text_editor_maximized: permet d'agrandir l'éditeur au maximum du contenu
+global_search: recherche
+global_search_placeholder: rechercher articles, pages, fichiers...
+global_search_no_results: aucun résultat
+global_search_results_for: résultats pour
+editor_preview: Aperçu
+preview_building: Génération de l'aperçu...
+preview_close: Fermer l'aperçu
+preview_refresh: Rafraîchir l'aperçu

data/hyde_admin.gemspec

@@ -25,14 +25,12 @@ Gem::Specification.new do |s|
   }
 
   s.license       = 'MIT'
-  s.add_runtime_dependency("roda", "~> 3.48.0")
-  s.add_runtime_dependency("roda-i18n", "~> 0.4.0")
-  s.add_runtime_dependency("roda-http-auth", "0.2.0")
-  s.add_runtime_dependency("escape_utils") # escape_javascript / escape_html
-  #s.add_runtime_dependency("i18n", "~> 0.4.0") # I18n.transliterate (already required by jekyll)
-  s.add_runtime_dependency('jekyll') # Because we call jekyll binary
-  s.add_runtime_dependency('image_processing') # JPEG quality
+  s.add_runtime_dependency("roda", "~> 3.48")
+  s.add_runtime_dependency("roda-i18n", "~> 0.4")
+  s.add_runtime_dependency("roda-http-auth", "~> 0.2")
+  s.add_runtime_dependency('jekyll')
+  s.add_runtime_dependency('image_processing')
   s.add_runtime_dependency('mini_magick')
-  s.add_runtime_dependency('rack', '2.2.4')
+  s.add_runtime_dependency('rack', "~> 2.2")
   s.add_runtime_dependency('puma')
 end

data/lib/hyde_admin/version.rb

@@ -1,3 +1,3 @@
 module HydeAdmin
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end