Skip to content

Commit

Permalink
[TASK] Raise version to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xperseguers committed Jan 20, 2021
1 parent 313e683 commit 338cfab
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 20 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Classes/Service/AbstractService.php
Expand Up @@ -53,7 +53,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher = null)
? (new \TYPO3\CMS\Core\Information\Typo3Version())->getBranch()
: TYPO3_branch;
if (version_compare($typo3Branch, '9.0', '<')) {
$this->settings = unsercialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['extractor'] ?? '') ?? [];
$this->settings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['extractor'] ?? '') ?? [];
} else {
$this->settings = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['extractor'] ?? [];
}
Expand Down
6 changes: 3 additions & 3 deletions Documentation/AdministratorManual/Install.rst
Expand Up @@ -98,6 +98,6 @@ External Tools

This extension is capable of using external tools to extract metadata:

- `exiftool <http://www.sno.phy.queensu.ca/~phil/exiftool/>`__ for files
containing EXIF, IPTC / XMP metadata;
- `pdfinfo <http://linuxcommand.org/man_pages/pdfinfo1.html>`__ for PDF.
- `exiftool <https://exiftool.org/>`__ for files containing EXIF, IPTC / XMP
metadata;
- `pdfinfo <https://www.xpdfreader.com/pdfinfo-man.html>`__ for PDF.
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Expand Up @@ -2,7 +2,7 @@

project = Metadata and Content Analysis Service
version = 2.0
release = 2.0.0-dev
release = 2.0.0
t3author = Xavier Perseguers
copyright = 2014-2021

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.yml
Expand Up @@ -7,7 +7,7 @@ conf.py:
copyright: 2014-2021
project: Metadata and Content Analysis Service
version: 2.0
release: 2.0.0-dev
release: 2.0.0
latex_documents:
- - Index
- extractor.tex
Expand Down
27 changes: 15 additions & 12 deletions README.rst
@@ -1,26 +1,29 @@
Metadata and content analysis service
=====================================

This extension detects and extracts metadata (EXIF / IPTC / XMP / ...) from potentially thousand different file types
(such as MS Word/Powerpoint/Excel documents, PDF and images) and bring them automatically and natively to TYPO3 when
uploading assets. Works with built-in PHP functions but takes advantage of Apache Tika and other external tools for
enhanced metadata extraction.
This extension detects and extracts metadata (EXIF / IPTC / XMP / ...) from
potentially thousand different file types (such as MS Word/Powerpoint/Excel
documents, PDF and images) and bring them automatically and natively to TYPO3
when uploading assets. Works with built-in PHP functions but takes advantage of
Apache Tika and other external tools for enhanced metadata extraction.

.. image:: Documentation/Images/metadata.png
:alt: Metadata for a document
:alt: Metadata for a document


Requirements
------------

For best results, `Apache Tika <https://tika.apache.org/download.html>`__ is required (either as standalone JAR or
running as server).
For best results, `Apache Tika <https://tika.apache.org/download.html>`__ is
required (either as standalone JAR or running as server).

Extraction of metadata from common image files (jpg, tiff, ...) is often quicker using external tool
`exiftool <http://www.sno.phy.queensu.ca/~phil/exiftool/>`__ and if not available, it will fall back to PHP's built-in
EXIF and IPTC library.
Extraction of metadata from common image files (jpg, tiff, ...) is often quicker
using external tool `exiftool <https://exiftool.org/>`__ and if not available,
it will fall back to PHP's built-in EXIF and IPTC library.

For PDF, external tool `pdfinfo <http://linuxcommand.org/man_pages/pdfinfo1.html>`__ will be used.
For PDF, external tool
`pdfinfo <https://www.xpdfreader.com/pdfinfo-man.html>`__ will be used.


Read more in the `manual <https://docs.typo3.org/typo3cms/extensions/extractor/>`__.
Read more in the
`manual <https://docs.typo3.org/p/causal/extractor/master/en-us/>`__.
4 changes: 2 additions & 2 deletions ext_emconf.php
Expand Up @@ -21,11 +21,11 @@
'uploadfolder' => 0,
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '2.0.0-dev',
'version' => '2.0.0',
'constraints' => [
'depends' => [
'php' => '7.2.0-7.4.99',
'typo3' => '8.7.0-11.0.99',
'typo3' => '8.7.0-11.5.99',
'filemetadata' => '',
],
'conflicts' => [],
Expand Down

0 comments on commit 338cfab

Please sign in to comment.