From eef1420d2850900eb882afe7189cec3ad0fd9813 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 13 May 2024 14:33:12 +0100 Subject: [PATCH] JAL-4409 Fix some file extensions (including remove .txt) --- utils/install4j/auto_file_associations-i4j10.pl | 6 +- .../file_associations_auto-Info_plist.xml | 22 ++-- .../file_associations_auto-install4j10.xml | 138 ++++++++++---------- utils/install4j/install4j10_template.install4j | 12 ++ 4 files changed, 96 insertions(+), 82 deletions(-) diff --git a/utils/install4j/auto_file_associations-i4j10.pl b/utils/install4j/auto_file_associations-i4j10.pl index f7e17a1..96aee95 100755 --- a/utils/install4j/auto_file_associations-i4j10.pl +++ b/utils/install4j/auto_file_associations-i4j10.pl @@ -30,7 +30,9 @@ my $mimetypes = { }; my @dontaddshortname = qw(features json); -my @dontaddextension = qw(html xml json jar mfa fastq); +# mfa and fastq not properly supported in Jalview (but enough to be in the application extensions) +# ENA flatfile extension txt is too generic, as well as html xml json jar +my @dontaddextension = qw(txt html xml json jar mfa fastq); my $add_associations = { biojson => {shortname=>"biojson",name=>"BioJSON",extensions=>["biojson"]}, gff2 => {shortname=>"gff2",name=>"Generic Features Format v2",extensions=>["gff2"]}, @@ -49,7 +51,7 @@ my $add_extensions = { my @put_first = qw(jalview jvl); my @owner = @put_first; -my @non_primary = qw(mmcif mmcif2 pdb); +my @non_primary = qw(mmcif mmcif2 pdb txt); my $v = ($i4jversion >= 8)?$i4jversion:""; my $i4jtemplatefile = "file_associations_template-install4j${v}.xml"; diff --git a/utils/install4j/file_associations_auto-Info_plist.xml b/utils/install4j/file_associations_auto-Info_plist.xml index 2e23321..1a75139 100644 --- a/utils/install4j/file_associations_auto-Info_plist.xml +++ b/utils/install4j/file_associations_auto-Info_plist.xml @@ -217,10 +217,11 @@ CFBundleTypeExtensions -txt +fa +fasta CFBundleTypeName -ENA Flatfile File +Fasta File CFBundleTypeIconFile Jalview-File.icns CFBundleTypeRole @@ -229,7 +230,7 @@ Default CFBundleTypeMIMETypes -application/x-embl+txt +application/x-fasta+txt LSIsAppleDefaultForType @@ -238,11 +239,11 @@ CFBundleTypeExtensions -fa -fasta +features +jvfeatures CFBundleTypeName -Fasta File +Jalview Features File CFBundleTypeIconFile Jalview-File.icns CFBundleTypeRole @@ -251,7 +252,7 @@ Default CFBundleTypeMIMETypes -application/x-fasta+txt +application/x-jalview-features+text LSIsAppleDefaultForType @@ -260,11 +261,10 @@ CFBundleTypeExtensions -features -jvfeatures +fc CFBundleTypeName -Jalview Features File +Jalview Feature Settings File File CFBundleTypeIconFile Jalview-File.icns CFBundleTypeRole @@ -273,7 +273,7 @@ Default CFBundleTypeMIMETypes -application/x-jalview-features+text +application/x-featuresettings+txt LSIsAppleDefaultForType diff --git a/utils/install4j/file_associations_auto-install4j10.xml b/utils/install4j/file_associations_auto-install4j10.xml index ee70251..4a87364 100644 --- a/utils/install4j/file_associations_auto-install4j10.xml +++ b/utils/install4j/file_associations_auto-install4j10.xml @@ -53,9 +53,9 @@ - + - + @@ -98,9 +98,9 @@ - + - + @@ -143,9 +143,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -233,9 +233,9 @@ - + - + @@ -278,9 +278,9 @@ - + - + @@ -323,9 +323,9 @@ - + - + @@ -368,9 +368,9 @@ - + - + @@ -413,9 +413,9 @@ - + - + @@ -448,26 +448,26 @@ - - + + - ENA Flatfile (.txt) + Fasta (.fa, .fasta) Creating file associations... - + - + - + - ENA Flatfile File - txt + Fasta File + fa,fasta JALVIEW - - + + - Fasta (.fa, .fasta) + Jalview Features (.features, .jvfeatures) Creating file associations... - + - + - + - Fasta File - fa,fasta + Jalview Features File + features,jvfeatures JALVIEW - - + + - Jalview Features (.features, .jvfeatures) + Jalview Feature Settings File (.fc) Creating file associations... - + - + - + - Jalview Features File - features,jvfeatures + Jalview Feature Settings File File + fc JALVIEW