runeblog.rb in runeblog-0.3.14

- old
+ new

@@ -112,11 +112,13 @@
     repo_root = Dir.pwd/root_rel
     check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
 
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
-      create_dirs(:data, :config, :drafts, :views, :posts)
+      create_dirs(:data, :config, :widgets, :drafts, :views, :posts)  # ?? widgets?
+      # FIXME
+      get_all_widgets("widgets")
       new_sequence
     end
     unless File.exist?(repo_root/"data/VIEW")
       copy_data(repo_root/:data)   
     end
@@ -359,10 +361,12 @@
   def make_empty_view_tree(view_name)
     log!(enter: __method__, args: [view_name], level: 2)
     Dir.chdir(@root) do
       cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
       system!(cmd)
+      cmd = "cp -r widgets views/#{view_name}"
+      system!(cmd)
     end
   rescue => err
     _tmp_error(err)
   end
 
@@ -658,18 +662,18 @@
 
   def copy_widget_html(view)
     log!(enter: __method__, level: 2)
     vdir = @root/:views/view
     remote = vdir/:remote
-    wdir = vdir/:themes/:standard/:widgets
+    wdir = vdir/:widgets
     widgets = Dir[wdir/"*"].select {|w| File.directory?(w) }
     widgets.each do |w|
       dir = File.basename(w)
-      rem = w.sub(/themes.standard/, "remote")
+      rem = w.sub(/widgets/, "remote/widgets")
       create_dirs(rem)
       files = Dir[w/"*"]
-      files = files.select {|x| x =~ /(html|css)$/ }
+      # files = files.select {|x| x =~ /(html|css)$/ }
       tag = File.basename(w)
       files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
     end
   rescue => err
     _tmp_error(err)
@@ -686,9 +690,10 @@
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
     ahtml = aslug + ".html"            # this-is-a-post.html
     pdraft = @root/:posts/nslug
     remote = @root/:views/view_name/:remote
     @theme = @root/:views/view_name/:themes/:standard
+
     # Step 1...
     create_dirs(pdraft)
     # FIXME dependencies?
     preprocess cwd: pdraft, src: draft, dst: "guts.html",
                mix: "liveblog"  # , debug: true