EPUBMaker: support to load static files from subdir

kmuto · Jul 30, 2024 · 176be96 · 176be96
1 parent 2f993b3
commit 176be96
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -523,7 +523,7 @@ def copy_stylesheet(basetmpdir)
     end
 
     def copy_static_file(configname, destdir, destfilename: nil)
-      destfilename ||= @config[configname]
+      destfilename ||= File.basename(@config[configname])
       unless File.exist?(@config[configname])
         error! "#{configname}: #{@config[configname]} is not found."
       end

diff --git a/lib/review/epubmaker/epubcommon.rb b/lib/review/epubmaker/epubcommon.rb
@@ -1,6 +1,6 @@
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -320,19 +320,19 @@ def flat_ncx(type, indent = nil)
       end
 
       def produce_write_common(basedir, tmpdir)
-        File.write("#{tmpdir}/mimetype", mimetype)
+        File.write(File.join(tmpdir, 'mimetype'), mimetype)
 
-        FileUtils.mkdir_p("#{tmpdir}/META-INF")
-        File.write("#{tmpdir}/META-INF/container.xml", container)
+        FileUtils.mkdir_p(File.join(tmpdir, 'META-INF'))
+        File.write(File.join(tmpdir, 'META-INF', 'container.xml'), container)
 
-        FileUtils.mkdir_p("#{tmpdir}/OEBPS")
+        FileUtils.mkdir_p(File.join(tmpdir, 'OEBPS'))
         File.write(File.join(tmpdir, opf_path), opf)
 
         if config['cover']
-          if File.exist?("#{basedir}/#{config['cover']}")
-            FileUtils.cp("#{basedir}/#{config['cover']}", "#{tmpdir}/OEBPS")
+          if File.exist?(File.join(basedir, File.basename(config['cover'])))
+            FileUtils.cp(File.join(basedir, File.basename(config['cover'])), File.join(tmpdir, 'OEBPS'))
           else
-            File.write("#{tmpdir}/OEBPS/#{config['cover']}", cover)
+            File.write(File.join(tmpdir, 'OEBPS', File.basename(config['cover'])), cover)
           end
         end
 
@@ -344,13 +344,13 @@ def produce_write_common(basedir, tmpdir)
         contents.each do |item|
           next if /#/.match?(item.file) # skip subgroup
 
-          fname = "#{basedir}/#{item.file}"
+          fname = File.join(basedir, item.file)
           unless File.exist?(fname)
             raise ApplicationError, "#{fname} is not found."
           end
 
-          FileUtils.mkdir_p(File.dirname("#{tmpdir}/OEBPS/#{item.file}"))
-          FileUtils.cp(fname, "#{tmpdir}/OEBPS/#{item.file}")
+          FileUtils.mkdir_p(File.dirname(File.join(tmpdir, 'OEBPS', item.file)))
+          FileUtils.cp(fname, File.join(tmpdir, 'OEBPS', item.file))
         end
       end