Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: PRONOM v92 and container signatures 20170920 #115

Merged
merged 3 commits into from
Oct 27, 2017
Merged

Update: PRONOM v92 and container signatures 20170920 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cf481b
Update: PRONOM v92 and container signatures 20170920
sevein Oct 19, 2017
3695f4d
Add .coverage to gitignore
sevein Oct 19, 2017
a5b432c
Bump version number to 1.3.7
sevein Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/build
/.cache
/.eggs
.coverage

/fmtinfo.csv
/exp
Expand Down
2 changes: 1 addition & 1 deletion fido/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from six.moves import input as rinput


__version__ = '1.3.6'
__version__ = '1.3.7'


CONFIG_DIR = join(abspath(dirname(__file__)), 'conf')
Expand Down
2 changes: 0 additions & 2 deletions fido/conf/DROID_SignatureFile-v90.xml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions fido/conf/DROID_SignatureFile-v92.xml
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 27 additions & 5 deletions fido/conf/container-signature-20170330.xml → fido/conf/container-signature-20170920.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<ContainerSignatureMapping schemaVersion="1.0" signatureVersion="20">
<ContainerSignatureMapping schemaVersion="1.0" signatureVersion="21">
<ContainerSignatures>

<ContainerSignature Id="1000" ContainerType="OLE2">
<Description>Microsoft Word 6.0/95 OLE2</Description>
<Files>
Expand Down Expand Up @@ -2837,7 +2836,7 @@
<InternalSignature ID="24100">
<ByteSequence Reference="BOFoffset">
<SubSequence Position="1" SubSeqMinOffset="0" SubSeqMaxOffset="0">
<Sequence>'ÿWPC'</Sequence>
<Sequence>FF 'WPC'</Sequence>
</SubSequence>
</ByteSequence>
<ByteSequence Reference="BOFoffset">
Expand All @@ -2862,7 +2861,7 @@
<InternalSignature ID="24200">
<ByteSequence Reference="BOFoffset">
<SubSequence Position="1" SubSeqMinOffset="0" SubSeqMaxOffset="0">
<Sequence>'ÿWPC'</Sequence>
<Sequence>FF 'WPC'</Sequence>
</SubSequence>
</ByteSequence>
<ByteSequence Reference="BOFoffset">
Expand Down Expand Up @@ -3235,7 +3234,27 @@
</BinarySignatures>
</File>
</Files>
</ContainerSignature>
</ContainerSignature>

<ContainerSignature Id="33000" ContainerType="OLE2">
<Description>Hangul Word Processor Document 5</Description>
<Files>
<File>
<Path>FileHeader</Path>
<BinarySignatures>
<InternalSignatureCollection>
<InternalSignature ID="33000">
<ByteSequence Reference="BOFoffset">
<SubSequence Position="1" SubSeqMinOffset="0" SubSeqMaxOffset="0">
<Sequence>'HWP Document File'</Sequence>
</SubSequence>
</ByteSequence>
</InternalSignature>
</InternalSignatureCollection>
</BinarySignatures>
</File>
</Files>
</ContainerSignature>


</ContainerSignatures>
Expand Down Expand Up @@ -3573,6 +3592,9 @@
<!-- Krita Document Format(ZIP)-->
<FileFormatMapping signatureId="32010" Puid="fmt/999"/>

<!-- Hangul Word Processor Document 5(OLE2)-->
<FileFormatMapping signatureId="33000" Puid="fmt/1084"/>

</FileFormatMappings>

<TriggerPuids>
Expand Down
2,195 changes: 2,123 additions & 72 deletions fido/conf/formats-v90.xml → fido/conf/formats-v92.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed fido/conf/pronom-xml-v90.zip → fido/conf/pronom-xml-v92.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions fido/conf/versions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8'?>
<versions>
<pronomVersion>90</pronomVersion>
<pronomSignature>formats-v90.xml</pronomSignature>
<pronomContainerSignature>container-signature-20170330.xml</pronomContainerSignature>
<pronomVersion>92</pronomVersion>
<pronomSignature>formats-v92.xml</pronomSignature>
<pronomContainerSignature>container-signature-20170920.xml</pronomContainerSignature>
<fidoExtensionSignature>format_extensions.xml</fidoExtensionSignature>
<updateScript>1.3.6</updateScript>
</versions>
4 changes: 2 additions & 2 deletions fido/fido.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
'printmatch': "OK,%(info.time)s,%(info.puid)s,\"%(info.formatname)s\",\"%(info.signaturename)s\",%(info.filesize)s,\"%(info.filename)s\",\"%(info.mimetype)s\",\"%(info.matchtype)s\"\n",
'printnomatch': "KO,%(info.time)s,,,,%(info.filesize)s,\"%(info.filename)s\",,\"%(info.matchtype)s\"\n",
'format_files': [
'formats-v88.xml',
'formats-v92.xml',
'format_extensions.xml'
],
'containersignature_file': 'container-signature-20170330.xml',
'containersignature_file': 'container-signature-20170920.xml',
'container_bufsize': 512 * 1024, # (bytes)
'description': """Format Identification for Digital Objects (fido).
FIDO is a command-line tool to identify the file formats of digital objects.
Expand Down