libis-format 1.2.1 → 2.0.0

data/lib/libis/format/tool/spreadsheet_to_ods.rb

@@ -1,3 +1,4 @@
+# noinspection RubyResolve
 require 'fileutils'
 
 require 'libis/tools/extend/string'
@@ -13,11 +14,6 @@ module Libis
       class SpreadsheetToOds
         include ::Libis::Tools::Logger
 
-        def self.installed?
-          result = Libis::Tools::Command.run(Libis::Format::Config[:soffice_cmd], "--version")
-          result == 0
-        end
-
         def self.run(source, target, options = {})
           self.new.run source, target, options
         end
@@ -53,14 +49,10 @@ module Libis
 
           FileUtils.copy tgt_file, target, preserve: true
 
-          {
-            command: result,
-            files: [ target ]
-          }
-
         ensure
           FileUtils.rmtree workdir rescue nil
 
+          result[:out]
         end
       end
 

data/lib/libis/format/tool.rb

@@ -10,7 +10,7 @@ module Libis
       autoload :FileTool, 'libis/format/tool/file_tool'
 
       autoload :OfficeToPdf, 'libis/format/tool/office_to_pdf'
-      autoload :FFMpeg, 'libis/format/tool/ff_mpeg'
+      autoload :FFMpeg, 'libis/format/tool/ffmpeg'
       autoload :FopPdf, 'libis/format/tool/fop_pdf'
       autoload :PdfCopy, 'libis/format/tool/pdf_copy'
       autoload :PdfMerge, 'libis/format/tool/pdf_merge'

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.2.1'
+    VERSION = '2.0.0'
   end
 end

data/lib/libis/format/yaml_loader.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'singleton'
+
+module Libis
+  module Format
+    class YamlLoader
+      # noinspection RubyResolve
+      include Singleton
+
+      def query(key, value)
+        case key.to_s.downcase.to_sym
+        when :name
+          return [database[value.to_s.upcase.to_sym]]
+        when :category
+          database.find_all { |_, info| info.category == value.to_s.upcase.to_sym }
+        when :puid
+          database.find_all { |_, info| info.puids.include?(value) }
+        when :mimetype
+          database.find_all { |_, info| info.mimetypes.include?(value) }
+        when :extension
+          database.find_all { |_, info| info.extensions.include?(value) }
+        else
+          return []
+        end.map(&:last)
+      end
+
+      def load_formats(file_or_hash)
+        hash = file_or_hash.is_a?(Hash) ? file_or_hash : YAML::load_file(file_or_hash)
+        hash.each do |category, format_list|
+          format_list.each do |format_name, format_info|
+            format_info.symbolize_keys!
+            format_name = format_name.to_sym
+            new_info = Libis::Format::Info.new(
+                name: format_name,
+                category: category.to_sym,
+                description: format_info[:NAME],
+                puids: format_info[:PUID]&.strip&.split(/[\s,]+/)&.map { |v| v.strip } || [],
+                mimetypes: format_info[:MIME]&.strip&.split(/[\s,]+/)&.map(&:strip) || [],
+                extensions: format_info[:EXTENSIONS]&.strip&.split(/[\s,]+/)&.map { |v| v.strip } || []
+            )
+            if (old_info = database[format_name])
+              new_info = Libis::Format::Info.new(
+                  name: format_name,
+                  category: category.to_sym,
+                  description: new_info.description.blank? ? old_info.description : new_info.description,
+                  puids: (old_info.puids + new_info.puids).uniq,
+                  mimetypes: (old_info.mimetypes + new_info.mimetypes).uniq,
+                  extensions: (old_info.extensions + new_info.extensions).uniq
+              )
+            end
+            database[format_name] = new_info
+          end
+        end
+
+      end
+
+      private
+
+      attr_reader :database
+
+      def initialize
+        @database = {}
+        format_database = Libis::Format::Config[:format_library_database]
+        load_formats(format_database)
+      end
+
+    end
+
+  end
+end

data/lib/libis/format.rb

@@ -3,8 +3,11 @@ require 'libis/format/version'
 module Libis
   module Format
     autoload :Config, 'libis/format/config'
-    autoload :TypeDatabase, 'libis/format/type_database'
-    autoload :TypeDatabaseImpl, 'libis/format/type_database_impl'
+
+    autoload :Info, 'libis/format/info'
+    autoload :Library, 'libis/format/library'
+    autoload :YamlLoader, 'libis/format/yaml_loader'
+
     autoload :Identifier, 'libis/format/identifier'
 
     autoload :Tool, 'libis/format/tool'

data/libis-format.gemspec

@@ -3,8 +3,8 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'libis/format/version'
 require 'bundler'
+require 'libis/format/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'libis-format'
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'equivalent-xml', '~> 0.5'
-  if Gem::Platform::JAVA && spec.platform == Gem::Platform::JAVA
+  if spec.platform == Gem::Platform::JAVA
     spec.add_development_dependency 'saxon-xslt'
   else
     spec.add_development_dependency 'nokogiri'
@@ -39,6 +39,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'deep_dive', '~> 0.3'
   spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
   spec.add_runtime_dependency 'naturally', '~> 2.1'
-  spec.add_runtime_dependency 'pdfinfo', '~> 1.4'
-
-end
+end

data/tools/fop/fop.bat

@@ -1,75 +1,75 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
-
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-rem %~dp0 is the expanded pathname of the current script under NT
-set LOCAL_FOP_HOME=
-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
-
-rem Code from Apache Ant project
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
-rem with Win9x.
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-rem and for NT handling to skip to.
-:doneStart
-
-set LOGCHOICE=
-rem The default commons logger for JDK1.4 is JDK1.4Logger.
-rem To use a different logger, uncomment the one desired below
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
-
-set LOGLEVEL=
-rem Logging levels
-rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
-rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
-rem file instead.
-rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
-rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
-
-set LIBDIR=%LOCAL_FOP_HOME%lib
-
-set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
-for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
-
-set JAVAOPTS=-Denv.windir=%WINDIR%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
-goto runFop
-
-:noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=java
-
-:runFop
-rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-
-ENDLOCAL
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+rem %~dp0 is the expanded pathname of the current script under NT
+set LOCAL_FOP_HOME=
+if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
+
+rem Code from Apache Ant project
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
+rem with Win9x.
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+rem and for NT handling to skip to.
+:doneStart
+
+set LOGCHOICE=
+rem The default commons logger for JDK1.4 is JDK1.4Logger.
+rem To use a different logger, uncomment the one desired below
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+
+set LOGLEVEL=
+rem Logging levels
+rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
+rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
+rem file instead.
+rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
+rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
+
+set LIBDIR=%LOCAL_FOP_HOME%lib
+
+set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
+for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
+
+set JAVAOPTS=-Denv.windir=%WINDIR%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
+goto runFop
+
+:noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=java
+
+:runFop
+rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+
+ENDLOCAL

data/tools/fop/fop.cmd

@@ -1,31 +1,31 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
-
-set LOCAL_FOP_HOME=%~dp0
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-:doneStart
-
-call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
-
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
+
+set LOCAL_FOP_HOME=%~dp0
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+:doneStart
+
+call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
+