Merge pull request #721 from Stepanov-Sergey/master

Add formats: Archive, Video, Audio, Image

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -761,6 +761,72 @@ public class FessLabels extends UserMessages {
     /** The key of the message: TAR Archive */
     public static final String LABELS_facet_filetype_tar = "{labels.facet_filetype_tar}";
 
+    /** The key of the message: RAR Archive */
+    public static final String LABELS_facet_filetype_rar = "{labels.facet_filetype_rar}";
+
+    /** The key of the message: 3gp Video */
+    public static final String LABELS_facet_filetype_3gp = "{labels.facet_filetype_3gp}";
+
+    /** The key of the message: 3g2 Video */
+    public static final String LABELS_facet_filetype_3g2 = "{labels.facet_filetype_3g2}";
+
+    /** The key of the message: AVI Video */
+    public static final String LABELS_facet_filetype_avi = "{labels.facet_filetype_avi}";
+
+    /** The key of the message: FLV Video */
+    public static final String LABELS_facet_filetype_flv = "{labels.facet_filetype_flv}";
+
+    /** The key of the message: MPEG Video */
+    public static final String LABELS_facet_filetype_mpeg = "{labels.facet_filetype_mpeg}";
+
+    /** The key of the message: MP4 Video */
+    public static final String LABELS_facet_filetype_mp4 = "{labels.facet_filetype_mp4}";
+
+    /** The key of the message: M4V Video */
+    public static final String LABELS_facet_filetype_m4v = "{labels.facet_filetype_m4v}";
+
+    /** The key of the message: OGV Video */
+    public static final String LABELS_facet_filetype_ogv = "{labels.facet_filetype_ogv}";
+
+    /** The key of the message: QT Video */
+    public static final String LABELS_facet_filetype_qt = "{labels.facet_filetype_qt}";
+
+    /** The key of the message: WAV Audio */
+    public static final String LABELS_facet_filetype_wav = "{labels.facet_filetype_wav}";
+
+    /** The key of the message: AIF Audio */
+    public static final String LABELS_facet_filetype_aif = "{labels.facet_filetype_aif}";
+
+    /** The key of the message: MID Audio */
+    public static final String LABELS_facet_filetype_mid = "{labels.facet_filetype_mid}";
+
+    /** The key of the message: MPGA Audio */
+    public static final String LABELS_facet_filetype_mpga = "{labels.facet_filetype_mpga}";
+
+    /** The key of the message: MP4A Audio */
+    public static final String LABELS_facet_filetype_mp4a = "{labels.facet_filetype_mp4a}";
+
+    /** The key of the message: OGA Audio */
+    public static final String LABELS_facet_filetype_oga = "{labels.facet_filetype_oga}";
+
+    /** The key of the message: BMP image */
+    public static final String LABELS_facet_filetype_bmp = "{labels.facet_filetype_bmp}";
+
+    /** The key of the message: ICO image */
+    public static final String LABELS_facet_filetype_ico = "{labels.facet_filetype_ico}";
+
+    /** The key of the message: PNG image */
+    public static final String LABELS_facet_filetype_png = "{labels.facet_filetype_png}";
+
+    /** The key of the message: SVG image */
+    public static final String LABELS_facet_filetype_svg = "{labels.facet_filetype_svg}";
+
+    /** The key of the message: WEBP image */
+    public static final String LABELS_facet_filetype_webp = "{labels.facet_filetype_webp}";
+
+    /** The key of the message: TIFF image */
+    public static final String LABELS_facet_filetype_tiff = "{labels.facet_filetype_tiff}";
+
     /** The key of the message: Others */
     public static final String LABELS_facet_filetype_others = "{labels.facet_filetype_others}";
 

src/main/resources/app.xml

@@ -68,6 +68,28 @@
 					"filetype:bz",
 					"filetype:bz2",
 					"filetype:tar",
+					"filetype:rar",
+					"filetype:3gp",
+					"filetype:3g2",
+					"filetype:avi",
+					"filetype:flv",
+					"filetype:mpeg",
+					"filetype:mp4",
+					"filetype:ogv",
+					"filetype:qt",
+					"filetype:m4v",
+					"filetype:aif",
+					"filetype:mid",
+					"filetype:mpga",
+					"filetype:mp4a",
+					"filetype:oga",
+					"filetype:wav",
+					"filetype:webp",
+					"filetype:bmp",
+					"filetype:ico",
+					"filetype:png",
+					"filetype:svg",
+					"filetype:tiff",
 					"filetype:others"
 				]</property>
 			</component>
@@ -210,10 +232,95 @@
 						<arg>"labels.facet_filetype_tar"</arg>
 						<arg>"filetype:tar"</arg>
 					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_rar"</arg>
+						<arg>"filetype:rar"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_3gp"</arg>
+						<arg>"filetype:3gp"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_3g2"</arg>
+						<arg>"filetype:3g2"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_avi"</arg>
+						<arg>"filetype:avi"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_flv"</arg>
+						<arg>"filetype:flv"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_mpeg"</arg>
+						<arg>"filetype:mpeg"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_mp4"</arg>
+						<arg>"filetype:mp4"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_ogv"</arg>
+						<arg>"filetype:ogv"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_qt"</arg>
+						<arg>"filetype:qt"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_m4v"</arg>
+						<arg>"filetype:m4v"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_aif"</arg>
+						<arg>"filetype:aif"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_mid"</arg>
+						<arg>"filetype:mid"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_mpga"</arg>
+						<arg>"filetype:mpga"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_ogg"</arg>
+						<arg>"filetype:ogg"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_wav"</arg>
+						<arg>"filetype:wav"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_webp"</arg>
+						<arg>"filetype:webp"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_bmp"</arg>
+						<arg>"filetype:bmp"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_ico"</arg>
+						<arg>"filetype:ico"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_png"</arg>
+						<arg>"filetype:png"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_svg"</arg>
+						<arg>"filetype:svg"</arg>
+					</postConstruct>
+					<postConstruct name="addQuery">
+						<arg>"labels.facet_filetype_tiff"</arg>
+						<arg>"filetype:tiff"</arg>
+					</postConstruct>
 					<postConstruct name="addQuery">
 						<arg>"labels.facet_filetype_others"</arg>
 						<arg>"filetype:others"</arg>
 					</postConstruct>
+
 				</component>
 			</arg>
 		</postConstruct>

src/main/resources/fess_label.properties

@@ -244,6 +244,28 @@ labels.facet_filetype_7z=7z Archive
 labels.facet_filetype_bz=Bz Archive
 labels.facet_filetype_bz2=Bz2 Archive
 labels.facet_filetype_tar=TAR Archive
+labels.facet_filetype_rar=RAR Archive
+labels.facet_filetype_3gp=3gp Video
+labels.facet_filetype_3g2=3g2 Video
+labels.facet_filetype_avi=AVI Video
+labels.facet_filetype_flv=FLV Video
+labels.facet_filetype_mpeg=MPEG Video
+labels.facet_filetype_mp4=MP4 Video
+labels.facet_filetype_ogv=OGV Video
+labels.facet_filetype_qt=QuickTime Video
+labels.facet_filetype_m4v=M4V Video
+labels.facet_filetype_wav=WAV Audio
+labels.facet_filetype_aif=AIF Audio
+labels.facet_filetype_mid=MIDI Audio
+labels.facet_filetype_mpga=MPGA Audio
+labels.facet_filetype_mp4a=MP4A Audio
+labels.facet_filetype_oga=OGA Audio
+labels.facet_filetype_wepb=WEBP Image
+labels.facet_filetype_bmp=BMP Image
+labels.facet_filetype_ico=ICO Image
+labels.facet_filetype_png=PNG Image
+labels.facet_filetype_svg=SVG Image
+labels.facet_filetype_tiff=TIFF Image
 labels.facet_filetype_others=Others
 labels.facet_label_reset=Reset
 labels.searchoptions_all=All

src/main/resources/fess_label_en.properties

@@ -244,6 +244,28 @@ labels.facet_filetype_7z=7z Archive
 labels.facet_filetype_bz=Bz Archive
 labels.facet_filetype_bz2=Bz2 Archive
 labels.facet_filetype_tar=TAR Archive
+labels.facet_filetype_rar=RAR Archive
+labels.facet_filetype_3gp=3gp Video
+labels.facet_filetype_3g2=3g2 Video
+labels.facet_filetype_avi=AVI Video
+labels.facet_filetype_flv=FLV Video
+labels.facet_filetype_mpeg=MPEG Video
+labels.facet_filetype_mp4=MP4 Video
+labels.facet_filetype_ogv=OGV Video
+labels.facet_filetype_qt=QuickTime Video
+labels.facet_filetype_m4v=M4V Video
+labels.facet_filetype_wav=WAV Audio
+labels.facet_filetype_aif=AIF Audio
+labels.facet_filetype_mid=MIDI Audio
+labels.facet_filetype_mpga=MPGA Audio
+labels.facet_filetype_mp4a=MP4A Audio
+labels.facet_filetype_oga=OGA Audio
+labels.facet_filetype_wepb=WEBP Image
+labels.facet_filetype_bmp=BMP Image
+labels.facet_filetype_ico=ICO Image
+labels.facet_filetype_png=PNG Image
+labels.facet_filetype_svg=SVG Image
+labels.facet_filetype_tiff=TIFF Image
 labels.facet_filetype_others=Others
 labels.facet_label_reset=Reset
 labels.searchoptions_all=All

src/main/resources/fess_label_ja.properties

@@ -240,6 +240,28 @@ labels.facet_filetype_7z=7z\u30a2\u30fc\u30ab\u30a4\u30d6
 labels.facet_filetype_bz=Bz\u30a2\u30fc\u30ab\u30a4\u30d6
 labels.facet_filetype_bz2=Bz2\u30a2\u30fc\u30ab\u30a4\u30d6
 labels.facet_filetype_tar=TAR\u30a2\u30fc\u30ab\u30a4\u30d6
+labels.facet_filetype_rar=RAR Archive
+labels.facet_filetype_3gp=3gp Video
+labels.facet_filetype_3g2=3g2 Video
+labels.facet_filetype_avi=AVI Video
+labels.facet_filetype_flv=FLV Video
+labels.facet_filetype_mpeg=MPEG Video
+labels.facet_filetype_mp4=MP4 Video
+labels.facet_filetype_ogv=OGV Video
+labels.facet_filetype_qt=QuickTime Video
+labels.facet_filetype_m4v=M4V Video
+labels.facet_filetype_wav=WAV Audio
+labels.facet_filetype_aif=AIF Audio
+labels.facet_filetype_mid=MIDI Audio
+labels.facet_filetype_mpga=MPGA Audio
+labels.facet_filetype_mp4a=MP4A Audio
+labels.facet_filetype_oga=OGA Audio
+labels.facet_filetype_wepb=WEBP Image
+labels.facet_filetype_bmp=BMP Image
+labels.facet_filetype_ico=ICO Image
+labels.facet_filetype_png=PNG Image
+labels.facet_filetype_svg=SVG Image
+labels.facet_filetype_tiff=TIFF Image
 labels.facet_filetype_others=\u305d\u306e\u4ed6
 labels.facet_label_reset=\u30ea\u30bb\u30c3\u30c8
 labels.searchoptions_all=\u3059\u3079\u3066

src/main/resources/fess_label_ko.properties

@@ -236,6 +236,28 @@ labels.facet_filetype_7z=7z Archive
 labels.facet_filetype_bz=Bz Archive
 labels.facet_filetype_bz2=Bz2 Archive
 labels.facet_filetype_tar=TAR Archive
+labels.facet_filetype_rar=RAR Archive
+labels.facet_filetype_3gp=3gp Video
+labels.facet_filetype_3g2=3g2 Video
+labels.facet_filetype_avi=AVI Video
+labels.facet_filetype_flv=FLV Video
+labels.facet_filetype_mpeg=MPEG Video
+labels.facet_filetype_mp4=MP4 Video
+labels.facet_filetype_ogv=OGV Video
+labels.facet_filetype_qt=QuickTime Video
+labels.facet_filetype_m4v=M4V Video
+labels.facet_filetype_wav=WAV Audio
+labels.facet_filetype_aif=AIF Audio
+labels.facet_filetype_mid=MIDI Audio
+labels.facet_filetype_mpga=MPGA Audio
+labels.facet_filetype_mp4a=MP4A Audio
+labels.facet_filetype_oga=OGA Audio
+labels.facet_filetype_wepb=WEBP Image
+labels.facet_filetype_bmp=BMP Image
+labels.facet_filetype_ico=ICO Image
+labels.facet_filetype_png=PNG Image
+labels.facet_filetype_svg=SVG Image
+labels.facet_filetype_tiff=TIFF Image
 labels.facet_filetype_others = \uae30\ud0c0
 labels.facet_label_reset = \uc7ac\uc124\uc815
 labels.searchoptions_all = \ubaa8\ub4e0

src/main/resources/fess_label_ru.properties

@@ -242,6 +242,28 @@ labels.facet_filetype_7z=7z Архив
 labels.facet_filetype_bz=Bz Архив
 labels.facet_filetype_bz2=Bz2 Архив
 labels.facet_filetype_tar=TAR Архив
+labels.facet_filetype_rar=RAR Archive
+labels.facet_filetype_3gp=3gp Video
+labels.facet_filetype_3g2=3g2 Video
+labels.facet_filetype_avi=AVI Video
+labels.facet_filetype_flv=FLV Video
+labels.facet_filetype_mpeg=MPEG Video
+labels.facet_filetype_mp4=MP4 Video
+labels.facet_filetype_ogv=OGV Video
+labels.facet_filetype_qt=QuickTime Video
+labels.facet_filetype_m4v=M4V Video
+labels.facet_filetype_wav=WAV Audio
+labels.facet_filetype_aif=AIF Audio
+labels.facet_filetype_mid=MIDI Audio
+labels.facet_filetype_mpga=MPGA Audio
+labels.facet_filetype_mp4a=MP4A Audio
+labels.facet_filetype_oga=OGA Audio
+labels.facet_filetype_wepb=WEBP Image
+labels.facet_filetype_bmp=BMP Image
+labels.facet_filetype_ico=ICO Image
+labels.facet_filetype_png=PNG Image
+labels.facet_filetype_svg=SVG Image
+labels.facet_filetype_tiff=TIFF Image
 labels.facet_filetype_others=Другие
 labels.facet_label_reset=Сброс
 labels.searchoptions_all=Все

src/main/webapp/WEB-INF/crawler/resources/app.xml

@@ -137,6 +137,98 @@
 			<arg>"application/x-tar"</arg>
 			<arg>"tar"</arg>
 		</postConstruct>
+		<postConstruct name="add">
+			<arg>"application/x-rar-compressed"</arg>
+			<arg>"rar"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/3gp"</arg>
+			<arg>"3gp"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/3g2"</arg>
+			<arg>"3g2"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/x-msvideo"</arg>
+			<arg>"avi"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/x-flv"</arg>
+			<arg>"flv"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/mpeg"</arg>
+			<arg>"mpeg"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/mp4"</arg>
+			<arg>"mp4"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/ogv"</arg>
+			<arg>"ogv"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/quicktime"</arg>
+			<arg>"qt"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"video/x-m4v"</arg>
+			<arg>"m4v"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/x-aif"</arg>
+			<arg>"aif"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/midi"</arg>
+			<arg>"midi"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/mpga"</arg>
+			<arg>"mpga"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/mp4"</arg>
+			<arg>"mp4a"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/ogg"</arg>
+			<arg>"oga"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"audio/x-wav"</arg>
+			<arg>"wav"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/webp"</arg>
+			<arg>"webp"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/bmp"</arg>
+			<arg>"bmp"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/x-icon"</arg>
+			<arg>"ico"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/x-icon"</arg>
+			<arg>"ico"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/png"</arg>
+			<arg>"png"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/svg+xml"</arg>
+			<arg>"svg"</arg>
+		</postConstruct>
+		<postConstruct name="add">
+			<arg>"image/tiff"</arg>
+			<arg>"tiff"</arg>
+		</postConstruct>
 	</component>
 	<component name="fessCrawler" class="org.codelibs.fess.exec.Crawler"
 		instance="prototype">