From f59118d1fe6a320d797b151a6f235f739ef3b487 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 13 Oct 2020 10:33:56 -0500 Subject: [PATCH] feat: add torrent-get 'primary-mime-type' to RPC. (#1464) * feat: add torrent-get 'primary-mime-type' to RPC. This is a cheap way for RPC clients to know what type of content is in a torrent. This info can be used to display the torrent, e.g. by using an icon that corresponds to the mime type. * use size_t for content byte count Co-authored-by: Mike Gelfand * explicit boolean expressions Co-authored-by: Mike Gelfand * use uint64_t for content byte counts Co-authored-by: Mike Gelfand * avoid unnecessary logic branches Co-authored-by: Mike Gelfand * explicit cast Co-authored-by: Mike Gelfand * refactor: add an autogenerated mime-type.h header * chore: maybe fix the win32 FTBFS * chore: add mime-types.[ch] to xcode * Squashed commit of the following: commit 4c7153fa48d86627af3a0ec4e1369632c81484d0 Author: Mike Gelfand Date: Tue Oct 13 03:15:19 2020 +0300 Remove autotools-based build system (#1465) * Support .git files (e.g. for worktrees, submodules) * Fix symlinks in source tarball, switch to TXZ, adjust non-release name * Remove autotools stuff Co-authored-by: Mike Gelfand --- Transmission.xcodeproj/project.pbxproj | 10 +- extras/rpc-spec.txt | 5 + libtransmission/CMakeLists.txt | 2 + libtransmission/mime-types.c | 1213 ++++++++++++++++++++++++ libtransmission/mime-types.h | 19 + libtransmission/mime-types.js | 72 ++ libtransmission/quark.c | 2 + libtransmission/quark.h | 2 + libtransmission/rpcimpl.c | 8 + libtransmission/torrent.c | 52 + libtransmission/torrent.h | 4 + libtransmission/utils.c | 36 + libtransmission/utils.h | 2 + qt/IconCache.cc | 62 +- qt/IconCache.h | 6 +- qt/Session.cc | 4 +- qt/Torrent.cc | 22 +- qt/Torrent.h | 4 + tests/libtransmission/utils-test.cc | 9 + 19 files changed, 1509 insertions(+), 25 deletions(-) create mode 100644 libtransmission/mime-types.c create mode 100644 libtransmission/mime-types.h create mode 100755 libtransmission/mime-types.js diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index c27d235ca..dcc88ad80 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -367,6 +367,8 @@ C1FEE5791C3223CC00D62832 /* watchdir-kqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = C1FEE5741C3223CC00D62832 /* watchdir-kqueue.c */; }; C1FEE57A1C3223CC00D62832 /* watchdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C1FEE5751C3223CC00D62832 /* watchdir.c */; }; C1FEE57B1C3223CC00D62832 /* watchdir.h in Headers */ = {isa = PBXBuildFile; fileRef = C1FEE5761C3223CC00D62832 /* watchdir.h */; }; + CAB35C64252F6F5E00552A55 /* mime-types.h in Headers */ = {isa = PBXBuildFile; fileRef = CAB35C62252F6F5E00552A55 /* mime-types.h */; }; + CAB35C65252F6F5E00552A55 /* mime-types.c in Sources */ = {isa = PBXBuildFile; fileRef = CAB35C63252F6F5E00552A55 /* mime-types.c */; }; D4AF3B2F0C41F7A500D46B6B /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = D4AF3B2D0C41F7A500D46B6B /* list.c */; }; D4AF3B300C41F7A600D46B6B /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = D4AF3B2E0C41F7A500D46B6B /* list.h */; }; E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9760C04D88F00C5426C /* ProgressGradients.m */; }; @@ -1018,6 +1020,8 @@ C1FEE5741C3223CC00D62832 /* watchdir-kqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "watchdir-kqueue.c"; sourceTree = ""; }; C1FEE5751C3223CC00D62832 /* watchdir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = watchdir.c; sourceTree = ""; }; C1FEE5761C3223CC00D62832 /* watchdir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = watchdir.h; sourceTree = ""; }; + CAB35C62252F6F5E00552A55 /* mime-types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mime-types.h"; sourceTree = ""; }; + CAB35C63252F6F5E00552A55 /* mime-types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mime-types.c"; sourceTree = ""; }; D4AF3B2D0C41F7A500D46B6B /* list.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = ""; }; D4AF3B2E0C41F7A500D46B6B /* list.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = ""; }; E138A9750C04D88F00C5426C /* ProgressGradients.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProgressGradients.h; sourceTree = ""; }; @@ -1368,6 +1372,8 @@ 4D1838DC09DEC04A0047D688 /* libtransmission */ = { isa = PBXGroup; children = ( + CAB35C63252F6F5E00552A55 /* mime-types.c */, + CAB35C62252F6F5E00552A55 /* mime-types.h */, C1077A4A183EB29600634C22 /* error.c */, C1077A4B183EB29600634C22 /* error.h */, C1077A4C183EB29600634C22 /* file-posix.c */, @@ -1866,6 +1872,7 @@ A247A443114C701800547DFC /* InfoViewController.h in Headers */, A220EC5C118C8A060022B4BE /* tr-lpd.h in Headers */, A23547E311CD0B090046EAE6 /* cache.h in Headers */, + CAB35C64252F6F5E00552A55 /* mime-types.h in Headers */, A284214512DA663E00FBDDBB /* tr-udp.h in Headers */, C1077A4F183EB29600634C22 /* error.h in Headers */, A2679295130E00A000CB7464 /* tr-utp.h in Headers */, @@ -2173,7 +2180,6 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 0420; ORGANIZATIONNAME = "The Transmission Project"; TargetAttributes = { @@ -2204,6 +2210,7 @@ de, da, "pt-PT", + pt_PT, ); mainGroup = 29B97314FDCFA39411CA2CEA /* Transmission */; projectDirPath = ""; @@ -2414,6 +2421,7 @@ A201527E0D1C270F0081714F /* torrent-ctor.c in Sources */, A2D22A130D65EEE700007D5F /* verify.c in Sources */, 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */, + CAB35C65252F6F5E00552A55 /* mime-types.c in Sources */, A29DF8B90DB2544C00D04E5A /* resume.c in Sources */, A2A4E9220DE0F7EB000CE197 /* web.c in Sources */, A2A4EA0E0DE106EB000CE197 /* ConvertUTF.c in Sources */, diff --git a/extras/rpc-spec.txt b/extras/rpc-spec.txt index c83aabd60..8afeb5fce 100644 --- a/extras/rpc-spec.txt +++ b/extras/rpc-spec.txt @@ -195,6 +195,7 @@ errorString | string | tr_stat eta | number | tr_stat etaIdle | number | tr_stat + file-count | number | tr_info files | array (see below) | n/a fileStats | array (see below) | n/a hashString | string | tr_info @@ -223,6 +224,7 @@ pieceCount | number | tr_info pieceSize | number | tr_info priorities | array (see below) | n/a + primary-mime-type | string | tr_torrent queuePosition | number | tr_stat rateDownload (B/s) | number | tr_stat rateUpload (B/s) | number | tr_stat @@ -809,6 +811,9 @@ | | yes | torrent-set | new arg "labels" | | yes | torrent-get | new arg "editDate" | | yes | torrent-get | new request arg "format" + ------+---------+-----------+----------------------+------------------------------- + 17 | 3.01 | yes | torrent-get | new arg "file-count" + | | yes | torrent-get | new arg "primary-mime-type" 5.1. Upcoming Breakage diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt index fb8d6f84b..980adfec0 100644 --- a/libtransmission/CMakeLists.txt +++ b/libtransmission/CMakeLists.txt @@ -34,6 +34,7 @@ set(PROJECT_FILES magnet.c makemeta.c metainfo.c + mime-types.c natpmp.c net.c peer-io.c @@ -157,6 +158,7 @@ set(${PROJECT_NAME}_PRIVATE_HEADERS list.h magnet.h metainfo.h + mime-types.h natpmp_local.h net.h peer-common.h diff --git a/libtransmission/mime-types.c b/libtransmission/mime-types.c new file mode 100644 index 000000000..fab5092ba --- /dev/null +++ b/libtransmission/mime-types.c @@ -0,0 +1,1213 @@ +/* + * This file Copyright (C) 2020 Mnemosyne LLC + * + * It may be used under the GNU GPL versions 2 or 3 + * or any future license endorsed by Mnemosyne LLC. + */ + +#include "mime-types.h" + +struct mime_type_suffix const mime_type_suffixes[MIME_TYPE_SUFFIX_COUNT] = +{ + { "123", "application/vnd.lotus-1-2-3" }, + { "1km", "application/vnd.1000minds.decision-model+xml" }, + { "3dml", "text/vnd.in3d.3dml" }, + { "3ds", "image/x-3ds" }, + { "3g2", "video/3gpp2" }, + { "3gp", "video/3gpp" }, + { "3gpp", "audio/3gpp" }, + { "3gpp", "video/3gpp" }, + { "3mf", "model/3mf" }, + { "7z", "application/x-7z-compressed" }, + { "aab", "application/x-authorware-bin" }, + { "aac", "audio/x-aac" }, + { "aam", "application/x-authorware-map" }, + { "aas", "application/x-authorware-seg" }, + { "abw", "application/x-abiword" }, + { "ac", "application/pkix-attr-cert" }, + { "ac", "application/vnd.nokia.n-gage.ac+xml" }, + { "acc", "application/vnd.americandynamics.acc" }, + { "ace", "application/x-ace-compressed" }, + { "acu", "application/vnd.acucobol" }, + { "acutc", "application/vnd.acucorp" }, + { "adp", "audio/adpcm" }, + { "aep", "application/vnd.audiograph" }, + { "afm", "application/x-font-type1" }, + { "afp", "application/vnd.ibm.modcap" }, + { "ahead", "application/vnd.ahead.space" }, + { "ai", "application/postscript" }, + { "aif", "audio/x-aiff" }, + { "aifc", "audio/x-aiff" }, + { "aiff", "audio/x-aiff" }, + { "air", "application/vnd.adobe.air-application-installer-package+zip" }, + { "ait", "application/vnd.dvb.ait" }, + { "ami", "application/vnd.amiga.ami" }, + { "apk", "application/vnd.android.package-archive" }, + { "apng", "image/apng" }, + { "appcache", "text/cache-manifest" }, + { "application", "application/x-ms-application" }, + { "apr", "application/vnd.lotus-approach" }, + { "arc", "application/x-freearc" }, + { "arj", "application/x-arj" }, + { "asc", "application/pgp-signature" }, + { "asf", "video/x-ms-asf" }, + { "asm", "text/x-asm" }, + { "aso", "application/vnd.accpac.simply.aso" }, + { "asx", "video/x-ms-asf" }, + { "atc", "application/vnd.acucorp" }, + { "atom", "application/atom+xml" }, + { "atomcat", "application/atomcat+xml" }, + { "atomdeleted", "application/atomdeleted+xml" }, + { "atomsvc", "application/atomsvc+xml" }, + { "atx", "application/vnd.antix.game-component" }, + { "au", "audio/basic" }, + { "avi", "video/x-msvideo" }, + { "avif", "image/avif" }, + { "aw", "application/applixware" }, + { "azf", "application/vnd.airzip.filesecure.azf" }, + { "azs", "application/vnd.airzip.filesecure.azs" }, + { "azv", "image/vnd.airzip.accelerator.azv" }, + { "azw", "application/vnd.amazon.ebook" }, + { "b16", "image/vnd.pco.b16" }, + { "bat", "application/x-msdownload" }, + { "bcpio", "application/x-bcpio" }, + { "bdf", "application/x-font-bdf" }, + { "bdm", "application/vnd.syncml.dm+wbxml" }, + { "bdoc", "application/bdoc" }, + { "bdoc", "application/x-bdoc" }, + { "bed", "application/vnd.realvnc.bed" }, + { "bh2", "application/vnd.fujitsu.oasysprs" }, + { "bin", "application/octet-stream" }, + { "blb", "application/x-blorb" }, + { "blorb", "application/x-blorb" }, + { "bmi", "application/vnd.bmi" }, + { "bmml", "application/vnd.balsamiq.bmml+xml" }, + { "bmp", "image/bmp" }, + { "bmp", "image/x-ms-bmp" }, + { "book", "application/vnd.framemaker" }, + { "box", "application/vnd.previewsystems.box" }, + { "boz", "application/x-bzip2" }, + { "bpk", "application/octet-stream" }, + { "bsp", "model/vnd.valve.source.compiled-map" }, + { "btif", "image/prs.btif" }, + { "buffer", "application/octet-stream" }, + { "bz", "application/x-bzip" }, + { "bz2", "application/x-bzip2" }, + { "c", "text/x-c" }, + { "c11amc", "application/vnd.cluetrust.cartomobile-config" }, + { "c11amz", "application/vnd.cluetrust.cartomobile-config-pkg" }, + { "c4d", "application/vnd.clonk.c4group" }, + { "c4f", "application/vnd.clonk.c4group" }, + { "c4g", "application/vnd.clonk.c4group" }, + { "c4p", "application/vnd.clonk.c4group" }, + { "c4u", "application/vnd.clonk.c4group" }, + { "cab", "application/vnd.ms-cab-compressed" }, + { "caf", "audio/x-caf" }, + { "cap", "application/vnd.tcpdump.pcap" }, + { "car", "application/vnd.curl.car" }, + { "cat", "application/vnd.ms-pki.seccat" }, + { "cb7", "application/x-cbr" }, + { "cba", "application/x-cbr" }, + { "cbr", "application/x-cbr" }, + { "cbt", "application/x-cbr" }, + { "cbz", "application/x-cbr" }, + { "cc", "text/x-c" }, + { "cco", "application/x-cocoa" }, + { "cct", "application/x-director" }, + { "ccxml", "application/ccxml+xml" }, + { "cdbcmsg", "application/vnd.contact.cmsg" }, + { "cdf", "application/x-netcdf" }, + { "cdfx", "application/cdfx+xml" }, + { "cdkey", "application/vnd.mediastation.cdkey" }, + { "cdmia", "application/cdmi-capability" }, + { "cdmic", "application/cdmi-container" }, + { "cdmid", "application/cdmi-domain" }, + { "cdmio", "application/cdmi-object" }, + { "cdmiq", "application/cdmi-queue" }, + { "cdx", "chemical/x-cdx" }, + { "cdxml", "application/vnd.chemdraw+xml" }, + { "cdy", "application/vnd.cinderella" }, + { "cer", "application/pkix-cert" }, + { "cfs", "application/x-cfs-compressed" }, + { "cgm", "image/cgm" }, + { "chat", "application/x-chat" }, + { "chm", "application/vnd.ms-htmlhelp" }, + { "chrt", "application/vnd.kde.kchart" }, + { "cif", "chemical/x-cif" }, + { "cii", "application/vnd.anser-web-certificate-issue-initiation" }, + { "cil", "application/vnd.ms-artgalry" }, + { "cjs", "application/node" }, + { "cla", "application/vnd.claymore" }, + { "class", "application/java-vm" }, + { "clkk", "application/vnd.crick.clicker.keyboard" }, + { "clkp", "application/vnd.crick.clicker.palette" }, + { "clkt", "application/vnd.crick.clicker.template" }, + { "clkw", "application/vnd.crick.clicker.wordbank" }, + { "clkx", "application/vnd.crick.clicker" }, + { "clp", "application/x-msclip" }, + { "cmc", "application/vnd.cosmocaller" }, + { "cmdf", "chemical/x-cmdf" }, + { "cml", "chemical/x-cml" }, + { "cmp", "application/vnd.yellowriver-custom-menu" }, + { "cmx", "image/x-cmx" }, + { "cod", "application/vnd.rim.cod" }, + { "coffee", "text/coffeescript" }, + { "com", "application/x-msdownload" }, + { "conf", "text/plain" }, + { "cpio", "application/x-cpio" }, + { "cpp", "text/x-c" }, + { "cpt", "application/mac-compactpro" }, + { "crd", "application/x-mscardfile" }, + { "crl", "application/pkix-crl" }, + { "crt", "application/x-x509-ca-cert" }, + { "crx", "application/x-chrome-extension" }, + { "cryptonote", "application/vnd.rig.cryptonote" }, + { "csh", "application/x-csh" }, + { "csl", "application/vnd.citationstyles.style+xml" }, + { "csml", "chemical/x-csml" }, + { "csp", "application/vnd.commonspace" }, + { "css", "text/css" }, + { "cst", "application/x-director" }, + { "csv", "text/csv" }, + { "cu", "application/cu-seeme" }, + { "curl", "text/vnd.curl" }, + { "cww", "application/prs.cww" }, + { "cxt", "application/x-director" }, + { "cxx", "text/x-c" }, + { "dae", "model/vnd.collada+xml" }, + { "daf", "application/vnd.mobius.daf" }, + { "dart", "application/vnd.dart" }, + { "dataless", "application/vnd.fdsn.seed" }, + { "davmount", "application/davmount+xml" }, + { "dbf", "application/vnd.dbf" }, + { "dbk", "application/docbook+xml" }, + { "dcr", "application/x-director" }, + { "dcurl", "text/vnd.curl.dcurl" }, + { "dd2", "application/vnd.oma.dd2+xml" }, + { "ddd", "application/vnd.fujixerox.ddd" }, + { "ddf", "application/vnd.syncml.dmddf+xml" }, + { "dds", "image/vnd.ms-dds" }, + { "deb", "application/octet-stream" }, + { "deb", "application/x-debian-package" }, + { "def", "text/plain" }, + { "deploy", "application/octet-stream" }, + { "der", "application/x-x509-ca-cert" }, + { "dfac", "application/vnd.dreamfactory" }, + { "dgc", "application/x-dgc-compressed" }, + { "dic", "text/x-c" }, + { "dir", "application/x-director" }, + { "dis", "application/vnd.mobius.dis" }, + { "disposition-notification", "message/disposition-notification" }, + { "dist", "application/octet-stream" }, + { "distz", "application/octet-stream" }, + { "djv", "image/vnd.djvu" }, + { "djvu", "image/vnd.djvu" }, + { "dll", "application/octet-stream" }, + { "dll", "application/x-msdownload" }, + { "dmg", "application/octet-stream" }, + { "dmg", "application/x-apple-diskimage" }, + { "dmp", "application/vnd.tcpdump.pcap" }, + { "dms", "application/octet-stream" }, + { "dna", "application/vnd.dna" }, + { "doc", "application/msword" }, + { "docm", "application/vnd.ms-word.document.macroenabled.12" }, + { "docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" }, + { "dot", "application/msword" }, + { "dotm", "application/vnd.ms-word.template.macroenabled.12" }, + { "dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" }, + { "dp", "application/vnd.osgi.dp" }, + { "dpg", "application/vnd.dpgraph" }, + { "dra", "audio/vnd.dra" }, + { "drle", "image/dicom-rle" }, + { "dsc", "text/prs.lines.tag" }, + { "dssc", "application/dssc+der" }, + { "dtb", "application/x-dtbook+xml" }, + { "dtd", "application/xml-dtd" }, + { "dts", "audio/vnd.dts" }, + { "dtshd", "audio/vnd.dts.hd" }, + { "dump", "application/octet-stream" }, + { "dvb", "video/vnd.dvb.file" }, + { "dvi", "application/x-dvi" }, + { "dwd", "application/atsc-dwd+xml" }, + { "dwf", "model/vnd.dwf" }, + { "dwg", "image/vnd.dwg" }, + { "dxf", "image/vnd.dxf" }, + { "dxp", "application/vnd.spotfire.dxp" }, + { "dxr", "application/x-director" }, + { "ear", "application/java-archive" }, + { "ecelp4800", "audio/vnd.nuera.ecelp4800" }, + { "ecelp7470", "audio/vnd.nuera.ecelp7470" }, + { "ecelp9600", "audio/vnd.nuera.ecelp9600" }, + { "ecma", "application/ecmascript" }, + { "edm", "application/vnd.novadigm.edm" }, + { "edx", "application/vnd.novadigm.edx" }, + { "efif", "application/vnd.picsel" }, + { "ei6", "application/vnd.pg.osasli" }, + { "elc", "application/octet-stream" }, + { "emf", "application/x-msmetafile" }, + { "emf", "image/emf" }, + { "eml", "message/rfc822" }, + { "emma", "application/emma+xml" }, + { "emotionml", "application/emotionml+xml" }, + { "emz", "application/x-msmetafile" }, + { "eol", "audio/vnd.digital-winds" }, + { "eot", "application/vnd.ms-fontobject" }, + { "eps", "application/postscript" }, + { "epub", "application/epub+zip" }, + { "es", "application/ecmascript" }, + { "es3", "application/vnd.eszigno3+xml" }, + { "esa", "application/vnd.osgi.subsystem" }, + { "esf", "application/vnd.epson.esf" }, + { "et3", "application/vnd.eszigno3+xml" }, + { "etx", "text/x-setext" }, + { "eva", "application/x-eva" }, + { "evy", "application/x-envoy" }, + { "exe", "application/octet-stream" }, + { "exe", "application/x-msdos-program" }, + { "exe", "application/x-msdownload" }, + { "exi", "application/exi" }, + { "exr", "image/aces" }, + { "ext", "application/vnd.novadigm.ext" }, + { "ez", "application/andrew-inset" }, + { "ez2", "application/vnd.ezpix-album" }, + { "ez3", "application/vnd.ezpix-package" }, + { "f", "text/x-fortran" }, + { "f4v", "video/x-f4v" }, + { "f77", "text/x-fortran" }, + { "f90", "text/x-fortran" }, + { "fbs", "image/vnd.fastbidsheet" }, + { "fcdt", "application/vnd.adobe.formscentral.fcdt" }, + { "fcs", "application/vnd.isac.fcs" }, + { "fdf", "application/vnd.fdf" }, + { "fdt", "application/fdt+xml" }, + { "fe_launch", "application/vnd.denovo.fcselayout-link" }, + { "fg5", "application/vnd.fujitsu.oasysgp" }, + { "fgd", "application/x-director" }, + { "fh", "image/x-freehand" }, + { "fh4", "image/x-freehand" }, + { "fh5", "image/x-freehand" }, + { "fh7", "image/x-freehand" }, + { "fhc", "image/x-freehand" }, + { "fig", "application/x-xfig" }, + { "fits", "image/fits" }, + { "flac", "audio/x-flac" }, + { "fli", "video/x-fli" }, + { "flo", "application/vnd.micrografx.flo" }, + { "flv", "video/x-flv" }, + { "flw", "application/vnd.kde.kivio" }, + { "flx", "text/vnd.fmi.flexstor" }, + { "fly", "text/vnd.fly" }, + { "fm", "application/vnd.framemaker" }, + { "fnc", "application/vnd.frogans.fnc" }, + { "fo", "application/vnd.software602.filler.form+xml" }, + { "for", "text/x-fortran" }, + { "fpx", "image/vnd.fpx" }, + { "frame", "application/vnd.framemaker" }, + { "fsc", "application/vnd.fsc.weblaunch" }, + { "fst", "image/vnd.fst" }, + { "ftc", "application/vnd.fluxtime.clip" }, + { "fti", "application/vnd.anser-web-funds-transfer-initiation" }, + { "fvt", "video/vnd.fvt" }, + { "fxp", "application/vnd.adobe.fxp" }, + { "fxpl", "application/vnd.adobe.fxp" }, + { "fzs", "application/vnd.fuzzysheet" }, + { "g2w", "application/vnd.geoplan" }, + { "g3", "image/g3fax" }, + { "g3w", "application/vnd.geospace" }, + { "gac", "application/vnd.groove-account" }, + { "gam", "application/x-tads" }, + { "gbr", "application/rpki-ghostbusters" }, + { "gca", "application/x-gca-compressed" }, + { "gdl", "model/vnd.gdl" }, + { "gdoc", "application/vnd.google-apps.document" }, + { "geo", "application/vnd.dynageo" }, + { "geojson", "application/geo+json" }, + { "gex", "application/vnd.geometry-explorer" }, + { "ggb", "application/vnd.geogebra.file" }, + { "ggt", "application/vnd.geogebra.tool" }, + { "ghf", "application/vnd.groove-help" }, + { "gif", "image/gif" }, + { "gim", "application/vnd.groove-identity-message" }, + { "glb", "model/gltf-binary" }, + { "gltf", "model/gltf+json" }, + { "gml", "application/gml+xml" }, + { "gmx", "application/vnd.gmx" }, + { "gnumeric", "application/x-gnumeric" }, + { "gph", "application/vnd.flographit" }, + { "gpx", "application/gpx+xml" }, + { "gqf", "application/vnd.grafeq" }, + { "gqs", "application/vnd.grafeq" }, + { "gram", "application/srgs" }, + { "gramps", "application/x-gramps-xml" }, + { "gre", "application/vnd.geometry-explorer" }, + { "grv", "application/vnd.groove-injector" }, + { "grxml", "application/srgs+xml" }, + { "gsf", "application/x-font-ghostscript" }, + { "gsheet", "application/vnd.google-apps.spreadsheet" }, + { "gslides", "application/vnd.google-apps.presentation" }, + { "gtar", "application/x-gtar" }, + { "gtm", "application/vnd.groove-tool-message" }, + { "gtw", "model/vnd.gtw" }, + { "gv", "text/vnd.graphviz" }, + { "gxf", "application/gxf" }, + { "gxt", "application/vnd.geonext" }, + { "gz", "application/gzip" }, + { "h", "text/x-c" }, + { "h261", "video/h261" }, + { "h263", "video/h263" }, + { "h264", "video/h264" }, + { "hal", "application/vnd.hal+xml" }, + { "hbci", "application/vnd.hbci" }, + { "hbs", "text/x-handlebars-template" }, + { "hdd", "application/x-virtualbox-hdd" }, + { "hdf", "application/x-hdf" }, + { "heic", "image/heic" }, + { "heics", "image/heic-sequence" }, + { "heif", "image/heif" }, + { "heifs", "image/heif-sequence" }, + { "hej2", "image/hej2k" }, + { "held", "application/atsc-held+xml" }, + { "hh", "text/x-c" }, + { "hjson", "application/hjson" }, + { "hlp", "application/winhlp" }, + { "hpgl", "application/vnd.hp-hpgl" }, + { "hpid", "application/vnd.hp-hpid" }, + { "hps", "application/vnd.hp-hps" }, + { "hqx", "application/mac-binhex40" }, + { "hsj2", "image/hsj2" }, + { "htc", "text/x-component" }, + { "htke", "application/vnd.kenameaapp" }, + { "htm", "text/html" }, + { "html", "text/html" }, + { "hvd", "application/vnd.yamaha.hv-dic" }, + { "hvp", "application/vnd.yamaha.hv-voice" }, + { "hvs", "application/vnd.yamaha.hv-script" }, + { "i2g", "application/vnd.intergeo" }, + { "icc", "application/vnd.iccprofile" }, + { "ice", "x-conference/x-cooltalk" }, + { "icm", "application/vnd.iccprofile" }, + { "ico", "image/vnd.microsoft.icon" }, + { "ico", "image/x-icon" }, + { "ics", "text/calendar" }, + { "ief", "image/ief" }, + { "ifb", "text/calendar" }, + { "ifm", "application/vnd.shana.informed.formdata" }, + { "iges", "model/iges" }, + { "igl", "application/vnd.igloader" }, + { "igm", "application/vnd.insors.igm" }, + { "igs", "model/iges" }, + { "igx", "application/vnd.micrografx.igx" }, + { "iif", "application/vnd.shana.informed.interchange" }, + { "img", "application/octet-stream" }, + { "imp", "application/vnd.accpac.simply.imp" }, + { "ims", "application/vnd.ms-ims" }, + { "in", "text/plain" }, + { "ini", "text/plain" }, + { "ink", "application/inkml+xml" }, + { "inkml", "application/inkml+xml" }, + { "install", "application/x-install-instructions" }, + { "iota", "application/vnd.astraea-software.iota" }, + { "ipfix", "application/ipfix" }, + { "ipk", "application/vnd.shana.informed.package" }, + { "irm", "application/vnd.ibm.rights-management" }, + { "irp", "application/vnd.irepository.package+xml" }, + { "iso", "application/octet-stream" }, + { "iso", "application/x-iso9660-image" }, + { "itp", "application/vnd.shana.informed.formtemplate" }, + { "its", "application/its+xml" }, + { "ivp", "application/vnd.immervision-ivp" }, + { "ivu", "application/vnd.immervision-ivu" }, + { "jad", "text/vnd.sun.j2me.app-descriptor" }, + { "jade", "text/jade" }, + { "jam", "application/vnd.jam" }, + { "jar", "application/java-archive" }, + { "jardiff", "application/x-java-archive-diff" }, + { "java", "text/x-java-source" }, + { "jhc", "image/jphc" }, + { "jisp", "application/vnd.jisp" }, + { "jls", "image/jls" }, + { "jlt", "application/vnd.hp-jlyt" }, + { "jng", "image/x-jng" }, + { "jnlp", "application/x-java-jnlp-file" }, + { "joda", "application/vnd.joost.joda-archive" }, + { "jp2", "image/jp2" }, + { "jpe", "image/jpeg" }, + { "jpeg", "image/jpeg" }, + { "jpf", "image/jpx" }, + { "jpg", "image/jpeg" }, + { "jpg2", "image/jp2" }, + { "jpgm", "video/jpm" }, + { "jpgv", "video/jpeg" }, + { "jph", "image/jph" }, + { "jpm", "image/jpm" }, + { "jpm", "video/jpm" }, + { "jpx", "image/jpx" }, + { "js", "application/javascript" }, + { "json", "application/json" }, + { "json5", "application/json5" }, + { "jsonld", "application/ld+json" }, + { "jsonml", "application/jsonml+json" }, + { "jsx", "text/jsx" }, + { "jxr", "image/jxr" }, + { "jxra", "image/jxra" }, + { "jxrs", "image/jxrs" }, + { "jxs", "image/jxs" }, + { "jxsc", "image/jxsc" }, + { "jxsi", "image/jxsi" }, + { "jxss", "image/jxss" }, + { "kar", "audio/midi" }, + { "karbon", "application/vnd.kde.karbon" }, + { "kdbx", "application/x-keepass2" }, + { "key", "application/vnd.apple.keynote" }, + { "kfo", "application/vnd.kde.kformula" }, + { "kia", "application/vnd.kidspiration" }, + { "kml", "application/vnd.google-earth.kml+xml" }, + { "kmz", "application/vnd.google-earth.kmz" }, + { "kne", "application/vnd.kinar" }, + { "knp", "application/vnd.kinar" }, + { "kon", "application/vnd.kde.kontour" }, + { "kpr", "application/vnd.kde.kpresenter" }, + { "kpt", "application/vnd.kde.kpresenter" }, + { "kpxx", "application/vnd.ds-keypoint" }, + { "ksp", "application/vnd.kde.kspread" }, + { "ktr", "application/vnd.kahootz" }, + { "ktx", "image/ktx" }, + { "ktx2", "image/ktx2" }, + { "ktz", "application/vnd.kahootz" }, + { "kwd", "application/vnd.kde.kword" }, + { "kwt", "application/vnd.kde.kword" }, + { "lasxml", "application/vnd.las.las+xml" }, + { "latex", "application/x-latex" }, + { "lbd", "application/vnd.llamagraphics.life-balance.desktop" }, + { "lbe", "application/vnd.llamagraphics.life-balance.exchange+xml" }, + { "les", "application/vnd.hhe.lesson-player" }, + { "less", "text/less" }, + { "lgr", "application/lgr+xml" }, + { "lha", "application/x-lzh-compressed" }, + { "link66", "application/vnd.route66.link66+xml" }, + { "list", "text/plain" }, + { "list3820", "application/vnd.ibm.modcap" }, + { "listafp", "application/vnd.ibm.modcap" }, + { "litcoffee", "text/coffeescript" }, + { "lnk", "application/x-ms-shortcut" }, + { "log", "text/plain" }, + { "lostxml", "application/lost+xml" }, + { "lrf", "application/octet-stream" }, + { "lrm", "application/vnd.ms-lrm" }, + { "ltf", "application/vnd.frogans.ltf" }, + { "lua", "text/x-lua" }, + { "luac", "application/x-lua-bytecode" }, + { "lvp", "audio/vnd.lucent.voice" }, + { "lwp", "application/vnd.lotus-wordpro" }, + { "lzh", "application/x-lzh-compressed" }, + { "m13", "application/x-msmediaview" }, + { "m14", "application/x-msmediaview" }, + { "m1v", "video/mpeg" }, + { "m21", "application/mp21" }, + { "m2a", "audio/mpeg" }, + { "m2v", "video/mpeg" }, + { "m3a", "audio/mpeg" }, + { "m3u", "audio/x-mpegurl" }, + { "m3u8", "application/vnd.apple.mpegurl" }, + { "m4a", "audio/mp4" }, + { "m4a", "audio/x-m4a" }, + { "m4p", "application/mp4" }, + { "m4u", "video/vnd.mpegurl" }, + { "m4v", "video/x-m4v" }, + { "ma", "application/mathematica" }, + { "mads", "application/mads+xml" }, + { "maei", "application/mmt-aei+xml" }, + { "mag", "application/vnd.ecowin.chart" }, + { "maker", "application/vnd.framemaker" }, + { "man", "text/troff" }, + { "manifest", "text/cache-manifest" }, + { "map", "application/json" }, + { "mar", "application/octet-stream" }, + { "markdown", "text/markdown" }, + { "mathml", "application/mathml+xml" }, + { "mb", "application/mathematica" }, + { "mbk", "application/vnd.mobius.mbk" }, + { "mbox", "application/mbox" }, + { "mc1", "application/vnd.medcalcdata" }, + { "mcd", "application/vnd.mcd" }, + { "mcurl", "text/vnd.curl.mcurl" }, + { "md", "text/markdown" }, + { "mdb", "application/x-msaccess" }, + { "mdi", "image/vnd.ms-modi" }, + { "mdx", "text/mdx" }, + { "me", "text/troff" }, + { "mesh", "model/mesh" }, + { "meta4", "application/metalink4+xml" }, + { "metalink", "application/metalink+xml" }, + { "mets", "application/mets+xml" }, + { "mfm", "application/vnd.mfmp" }, + { "mft", "application/rpki-manifest" }, + { "mgp", "application/vnd.osgeo.mapguide.package" }, + { "mgz", "application/vnd.proteus.magazine" }, + { "mid", "audio/midi" }, + { "midi", "audio/midi" }, + { "mie", "application/x-mie" }, + { "mif", "application/vnd.mif" }, + { "mime", "message/rfc822" }, + { "mj2", "video/mj2" }, + { "mjp2", "video/mj2" }, + { "mjs", "application/javascript" }, + { "mk3d", "video/x-matroska" }, + { "mka", "audio/x-matroska" }, + { "mkd", "text/x-markdown" }, + { "mks", "video/x-matroska" }, + { "mkv", "video/x-matroska" }, + { "mlp", "application/vnd.dolby.mlp" }, + { "mmd", "application/vnd.chipnuts.karaoke-mmd" }, + { "mmf", "application/vnd.smaf" }, + { "mml", "text/mathml" }, + { "mmr", "image/vnd.fujixerox.edmics-mmr" }, + { "mng", "video/x-mng" }, + { "mny", "application/x-msmoney" }, + { "mobi", "application/x-mobipocket-ebook" }, + { "mods", "application/mods+xml" }, + { "mov", "video/quicktime" }, + { "movie", "video/x-sgi-movie" }, + { "mp2", "audio/mpeg" }, + { "mp21", "application/mp21" }, + { "mp2a", "audio/mpeg" }, + { "mp3", "audio/mp3" }, + { "mp3", "audio/mpeg" }, + { "mp4", "video/mp4" }, + { "mp4a", "audio/mp4" }, + { "mp4s", "application/mp4" }, + { "mp4v", "video/mp4" }, + { "mpc", "application/vnd.mophun.certificate" }, + { "mpd", "application/dash+xml" }, + { "mpe", "video/mpeg" }, + { "mpeg", "video/mpeg" }, + { "mpg", "video/mpeg" }, + { "mpg4", "video/mp4" }, + { "mpga", "audio/mpeg" }, + { "mpkg", "application/vnd.apple.installer+xml" }, + { "mpm", "application/vnd.blueice.multipass" }, + { "mpn", "application/vnd.mophun.application" }, + { "mpp", "application/vnd.ms-project" }, + { "mpt", "application/vnd.ms-project" }, + { "mpy", "application/vnd.ibm.minipay" }, + { "mqy", "application/vnd.mobius.mqy" }, + { "mrc", "application/marc" }, + { "mrcx", "application/marcxml+xml" }, + { "ms", "text/troff" }, + { "mscml", "application/mediaservercontrol+xml" }, + { "mseed", "application/vnd.fdsn.mseed" }, + { "mseq", "application/vnd.mseq" }, + { "msf", "application/vnd.epson.msf" }, + { "msg", "application/vnd.ms-outlook" }, + { "msh", "model/mesh" }, + { "msi", "application/octet-stream" }, + { "msi", "application/x-msdownload" }, + { "msl", "application/vnd.mobius.msl" }, + { "msm", "application/octet-stream" }, + { "msp", "application/octet-stream" }, + { "msty", "application/vnd.muvee.style" }, + { "mtl", "model/mtl" }, + { "mts", "model/vnd.mts" }, + { "mus", "application/vnd.musician" }, + { "musd", "application/mmt-usd+xml" }, + { "musicxml", "application/vnd.recordare.musicxml+xml" }, + { "mvb", "application/x-msmediaview" }, + { "mwf", "application/vnd.mfer" }, + { "mxf", "application/mxf" }, + { "mxl", "application/vnd.recordare.musicxml" }, + { "mxmf", "audio/mobile-xmf" }, + { "mxml", "application/xv+xml" }, + { "mxs", "application/vnd.triscape.mxs" }, + { "mxu", "video/vnd.mpegurl" }, + { "n-gage", "application/vnd.nokia.n-gage.symbian.install" }, + { "n3", "text/n3" }, + { "nb", "application/mathematica" }, + { "nbp", "application/vnd.wolfram.player" }, + { "nc", "application/x-netcdf" }, + { "ncx", "application/x-dtbncx+xml" }, + { "nfo", "text/x-nfo" }, + { "ngdat", "application/vnd.nokia.n-gage.data" }, + { "nitf", "application/vnd.nitf" }, + { "nlu", "application/vnd.neurolanguage.nlu" }, + { "nml", "application/vnd.enliven" }, + { "nnd", "application/vnd.noblenet-directory" }, + { "nns", "application/vnd.noblenet-sealer" }, + { "nnw", "application/vnd.noblenet-web" }, + { "npx", "image/vnd.net-fpx" }, + { "nq", "application/n-quads" }, + { "nsc", "application/x-conference" }, + { "nsf", "application/vnd.lotus-notes" }, + { "nt", "application/n-triples" }, + { "ntf", "application/vnd.nitf" }, + { "numbers", "application/vnd.apple.numbers" }, + { "nzb", "application/x-nzb" }, + { "oa2", "application/vnd.fujitsu.oasys2" }, + { "oa3", "application/vnd.fujitsu.oasys3" }, + { "oas", "application/vnd.fujitsu.oasys" }, + { "obd", "application/x-msbinder" }, + { "obgx", "application/vnd.openblox.game+xml" }, + { "obj", "application/x-tgif" }, + { "obj", "model/obj" }, + { "oda", "application/oda" }, + { "odb", "application/vnd.oasis.opendocument.database" }, + { "odc", "application/vnd.oasis.opendocument.chart" }, + { "odf", "application/vnd.oasis.opendocument.formula" }, + { "odft", "application/vnd.oasis.opendocument.formula-template" }, + { "odg", "application/vnd.oasis.opendocument.graphics" }, + { "odi", "application/vnd.oasis.opendocument.image" }, + { "odm", "application/vnd.oasis.opendocument.text-master" }, + { "odp", "application/vnd.oasis.opendocument.presentation" }, + { "ods", "application/vnd.oasis.opendocument.spreadsheet" }, + { "odt", "application/vnd.oasis.opendocument.text" }, + { "oga", "audio/ogg" }, + { "ogex", "model/vnd.opengex" }, + { "ogg", "audio/ogg" }, + { "ogv", "video/ogg" }, + { "ogx", "application/ogg" }, + { "omdoc", "application/omdoc+xml" }, + { "onepkg", "application/onenote" }, + { "onetmp", "application/onenote" }, + { "onetoc", "application/onenote" }, + { "onetoc2", "application/onenote" }, + { "opf", "application/oebps-package+xml" }, + { "opml", "text/x-opml" }, + { "oprc", "application/vnd.palm" }, + { "org", "application/vnd.lotus-organizer" }, + { "org", "text/x-org" }, + { "osf", "application/vnd.yamaha.openscoreformat" }, + { "osfpvg", "application/vnd.yamaha.openscoreformat.osfpvg+xml" }, + { "osm", "application/vnd.openstreetmap.data+xml" }, + { "otc", "application/vnd.oasis.opendocument.chart-template" }, + { "otf", "font/otf" }, + { "otg", "application/vnd.oasis.opendocument.graphics-template" }, + { "oth", "application/vnd.oasis.opendocument.text-web" }, + { "oti", "application/vnd.oasis.opendocument.image-template" }, + { "otp", "application/vnd.oasis.opendocument.presentation-template" }, + { "ots", "application/vnd.oasis.opendocument.spreadsheet-template" }, + { "ott", "application/vnd.oasis.opendocument.text-template" }, + { "ova", "application/x-virtualbox-ova" }, + { "ovf", "application/x-virtualbox-ovf" }, + { "owl", "application/rdf+xml" }, + { "oxps", "application/oxps" }, + { "oxt", "application/vnd.openofficeorg.extension" }, + { "p", "text/x-pascal" }, + { "p10", "application/pkcs10" }, + { "p12", "application/x-pkcs12" }, + { "p7b", "application/x-pkcs7-certificates" }, + { "p7c", "application/pkcs7-mime" }, + { "p7m", "application/pkcs7-mime" }, + { "p7r", "application/x-pkcs7-certreqresp" }, + { "p7s", "application/pkcs7-signature" }, + { "p8", "application/pkcs8" }, + { "pac", "application/x-ns-proxy-autoconfig" }, + { "pages", "application/vnd.apple.pages" }, + { "pas", "text/x-pascal" }, + { "paw", "application/vnd.pawaafile" }, + { "pbd", "application/vnd.powerbuilder6" }, + { "pbm", "image/x-portable-bitmap" }, + { "pcap", "application/vnd.tcpdump.pcap" }, + { "pcf", "application/x-font-pcf" }, + { "pcl", "application/vnd.hp-pcl" }, + { "pclxl", "application/vnd.hp-pclxl" }, + { "pct", "image/x-pict" }, + { "pcurl", "application/vnd.curl.pcurl" }, + { "pcx", "image/vnd.zbrush.pcx" }, + { "pcx", "image/x-pcx" }, + { "pdb", "application/vnd.palm" }, + { "pdb", "application/x-pilot" }, + { "pde", "text/x-processing" }, + { "pdf", "application/pdf" }, + { "pem", "application/x-x509-ca-cert" }, + { "pfa", "application/x-font-type1" }, + { "pfb", "application/x-font-type1" }, + { "pfm", "application/x-font-type1" }, + { "pfr", "application/font-tdpfr" }, + { "pfx", "application/x-pkcs12" }, + { "pgm", "image/x-portable-graymap" }, + { "pgn", "application/x-chess-pgn" }, + { "pgp", "application/pgp-encrypted" }, + { "php", "application/x-httpd-php" }, + { "pic", "image/x-pict" }, + { "pkg", "application/octet-stream" }, + { "pki", "application/pkixcmp" }, + { "pkipath", "application/pkix-pkipath" }, + { "pkpass", "application/vnd.apple.pkpass" }, + { "pl", "application/x-perl" }, + { "plb", "application/vnd.3gpp.pic-bw-large" }, + { "plc", "application/vnd.mobius.plc" }, + { "plf", "application/vnd.pocketlearn" }, + { "pls", "application/pls+xml" }, + { "pm", "application/x-perl" }, + { "pml", "application/vnd.ctc-posml" }, + { "png", "image/png" }, + { "pnm", "image/x-portable-anymap" }, + { "portpkg", "application/vnd.macports.portpkg" }, + { "pot", "application/vnd.ms-powerpoint" }, + { "potm", "application/vnd.ms-powerpoint.template.macroenabled.12" }, + { "potx", "application/vnd.openxmlformats-officedocument.presentationml.template" }, + { "ppam", "application/vnd.ms-powerpoint.addin.macroenabled.12" }, + { "ppd", "application/vnd.cups-ppd" }, + { "ppm", "image/x-portable-pixmap" }, + { "pps", "application/vnd.ms-powerpoint" }, + { "ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12" }, + { "ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" }, + { "ppt", "application/vnd.ms-powerpoint" }, + { "pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12" }, + { "pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" }, + { "pqa", "application/vnd.palm" }, + { "prc", "application/x-mobipocket-ebook" }, + { "prc", "application/x-pilot" }, + { "pre", "application/vnd.lotus-freelance" }, + { "prf", "application/pics-rules" }, + { "provx", "application/provenance+xml" }, + { "ps", "application/postscript" }, + { "psb", "application/vnd.3gpp.pic-bw-small" }, + { "psd", "image/vnd.adobe.photoshop" }, + { "psf", "application/x-font-linux-psf" }, + { "pskcxml", "application/pskc+xml" }, + { "pti", "image/prs.pti" }, + { "ptid", "application/vnd.pvi.ptid1" }, + { "pub", "application/x-mspublisher" }, + { "pvb", "application/vnd.3gpp.pic-bw-var" }, + { "pwn", "application/vnd.3m.post-it-notes" }, + { "pya", "audio/vnd.ms-playready.media.pya" }, + { "pyv", "video/vnd.ms-playready.media.pyv" }, + { "qam", "application/vnd.epson.quickanime" }, + { "qbo", "application/vnd.intu.qbo" }, + { "qfx", "application/vnd.intu.qfx" }, + { "qps", "application/vnd.publishare-delta-tree" }, + { "qt", "video/quicktime" }, + { "qwd", "application/vnd.quark.quarkxpress" }, + { "qwt", "application/vnd.quark.quarkxpress" }, + { "qxb", "application/vnd.quark.quarkxpress" }, + { "qxd", "application/vnd.quark.quarkxpress" }, + { "qxl", "application/vnd.quark.quarkxpress" }, + { "qxt", "application/vnd.quark.quarkxpress" }, + { "ra", "audio/x-pn-realaudio" }, + { "ra", "audio/x-realaudio" }, + { "ram", "audio/x-pn-realaudio" }, + { "raml", "application/raml+yaml" }, + { "rapd", "application/route-apd+xml" }, + { "rar", "application/vnd.rar" }, + { "rar", "application/x-rar-compressed" }, + { "ras", "image/x-cmu-raster" }, + { "rcprofile", "application/vnd.ipunplugged.rcprofile" }, + { "rdf", "application/rdf+xml" }, + { "rdz", "application/vnd.data-vision.rdz" }, + { "relo", "application/p2p-overlay+xml" }, + { "rep", "application/vnd.businessobjects" }, + { "res", "application/x-dtbresource+xml" }, + { "rgb", "image/x-rgb" }, + { "rif", "application/reginfo+xml" }, + { "rip", "audio/vnd.rip" }, + { "ris", "application/x-research-info-systems" }, + { "rl", "application/resource-lists+xml" }, + { "rlc", "image/vnd.fujixerox.edmics-rlc" }, + { "rld", "application/resource-lists-diff+xml" }, + { "rm", "application/vnd.rn-realmedia" }, + { "rmi", "audio/midi" }, + { "rmp", "audio/x-pn-realaudio-plugin" }, + { "rms", "application/vnd.jcp.javame.midlet-rms" }, + { "rmvb", "application/vnd.rn-realmedia-vbr" }, + { "rnc", "application/relax-ng-compact-syntax" }, + { "rng", "application/xml" }, + { "roa", "application/rpki-roa" }, + { "roff", "text/troff" }, + { "rp9", "application/vnd.cloanto.rp9" }, + { "rpm", "application/x-redhat-package-manager" }, + { "rpss", "application/vnd.nokia.radio-presets" }, + { "rpst", "application/vnd.nokia.radio-preset" }, + { "rq", "application/sparql-query" }, + { "rs", "application/rls-services+xml" }, + { "rsat", "application/atsc-rsat+xml" }, + { "rsd", "application/rsd+xml" }, + { "rsheet", "application/urc-ressheet+xml" }, + { "rss", "application/rss+xml" }, + { "rtf", "application/rtf" }, + { "rtf", "text/rtf" }, + { "rtx", "text/richtext" }, + { "run", "application/x-makeself" }, + { "rusd", "application/route-usd+xml" }, + { "s", "text/x-asm" }, + { "s3m", "audio/s3m" }, + { "saf", "application/vnd.yamaha.smaf-audio" }, + { "sass", "text/x-sass" }, + { "sbml", "application/sbml+xml" }, + { "sc", "application/vnd.ibm.secure-container" }, + { "scd", "application/x-msschedule" }, + { "scm", "application/vnd.lotus-screencam" }, + { "scq", "application/scvp-cv-request" }, + { "scs", "application/scvp-cv-response" }, + { "scss", "text/x-scss" }, + { "scurl", "text/vnd.curl.scurl" }, + { "sda", "application/vnd.stardivision.draw" }, + { "sdc", "application/vnd.stardivision.calc" }, + { "sdd", "application/vnd.stardivision.impress" }, + { "sdkd", "application/vnd.solent.sdkm+xml" }, + { "sdkm", "application/vnd.solent.sdkm+xml" }, + { "sdp", "application/sdp" }, + { "sdw", "application/vnd.stardivision.writer" }, + { "sea", "application/x-sea" }, + { "see", "application/vnd.seemail" }, + { "seed", "application/vnd.fdsn.seed" }, + { "sema", "application/vnd.sema" }, + { "semd", "application/vnd.semd" }, + { "semf", "application/vnd.semf" }, + { "senmlx", "application/senml+xml" }, + { "sensmlx", "application/sensml+xml" }, + { "ser", "application/java-serialized-object" }, + { "setpay", "application/set-payment-initiation" }, + { "setreg", "application/set-registration-initiation" }, + { "sfd-hdstx", "application/vnd.hydrostatix.sof-data" }, + { "sfs", "application/vnd.spotfire.sfs" }, + { "sfv", "text/x-sfv" }, + { "sgi", "image/sgi" }, + { "sgl", "application/vnd.stardivision.writer-global" }, + { "sgm", "text/sgml" }, + { "sgml", "text/sgml" }, + { "sh", "application/x-sh" }, + { "shar", "application/x-shar" }, + { "shex", "text/shex" }, + { "shf", "application/shf+xml" }, + { "shtml", "text/html" }, + { "sid", "image/x-mrsid-image" }, + { "sieve", "application/sieve" }, + { "sig", "application/pgp-signature" }, + { "sil", "audio/silk" }, + { "silo", "model/mesh" }, + { "sis", "application/vnd.symbian.install" }, + { "sisx", "application/vnd.symbian.install" }, + { "sit", "application/x-stuffit" }, + { "sitx", "application/x-stuffitx" }, + { "siv", "application/sieve" }, + { "skd", "application/vnd.koan" }, + { "skm", "application/vnd.koan" }, + { "skp", "application/vnd.koan" }, + { "skt", "application/vnd.koan" }, + { "sldm", "application/vnd.ms-powerpoint.slide.macroenabled.12" }, + { "sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" }, + { "slim", "text/slim" }, + { "slm", "text/slim" }, + { "sls", "application/route-s-tsid+xml" }, + { "slt", "application/vnd.epson.salt" }, + { "sm", "application/vnd.stepmania.stepchart" }, + { "smf", "application/vnd.stardivision.math" }, + { "smi", "application/smil+xml" }, + { "smil", "application/smil+xml" }, + { "smv", "video/x-smv" }, + { "smzip", "application/vnd.stepmania.package" }, + { "snd", "audio/basic" }, + { "snf", "application/x-font-snf" }, + { "so", "application/octet-stream" }, + { "spc", "application/x-pkcs7-certificates" }, + { "spdx", "text/spdx" }, + { "spf", "application/vnd.yamaha.smaf-phrase" }, + { "spl", "application/x-futuresplash" }, + { "spot", "text/vnd.in3d.spot" }, + { "spp", "application/scvp-vp-response" }, + { "spq", "application/scvp-vp-request" }, + { "spx", "audio/ogg" }, + { "sql", "application/x-sql" }, + { "src", "application/x-wais-source" }, + { "srt", "application/x-subrip" }, + { "sru", "application/sru+xml" }, + { "srx", "application/sparql-results+xml" }, + { "ssdl", "application/ssdl+xml" }, + { "sse", "application/vnd.kodak-descriptor" }, + { "ssf", "application/vnd.epson.ssf" }, + { "ssml", "application/ssml+xml" }, + { "st", "application/vnd.sailingtracker.track" }, + { "stc", "application/vnd.sun.xml.calc.template" }, + { "std", "application/vnd.sun.xml.draw.template" }, + { "stf", "application/vnd.wt.stf" }, + { "sti", "application/vnd.sun.xml.impress.template" }, + { "stk", "application/hyperstudio" }, + { "stl", "application/vnd.ms-pki.stl" }, + { "stl", "model/stl" }, + { "str", "application/vnd.pg.format" }, + { "stw", "application/vnd.sun.xml.writer.template" }, + { "styl", "text/stylus" }, + { "stylus", "text/stylus" }, + { "sub", "image/vnd.dvb.subtitle" }, + { "sub", "text/vnd.dvb.subtitle" }, + { "sus", "application/vnd.sus-calendar" }, + { "susp", "application/vnd.sus-calendar" }, + { "sv4cpio", "application/x-sv4cpio" }, + { "sv4crc", "application/x-sv4crc" }, + { "svc", "application/vnd.dvb.service" }, + { "svd", "application/vnd.svd" }, + { "svg", "image/svg+xml" }, + { "svgz", "image/svg+xml" }, + { "swa", "application/x-director" }, + { "swf", "application/x-shockwave-flash" }, + { "swi", "application/vnd.aristanetworks.swi" }, + { "swidtag", "application/swid+xml" }, + { "sxc", "application/vnd.sun.xml.calc" }, + { "sxd", "application/vnd.sun.xml.draw" }, + { "sxg", "application/vnd.sun.xml.writer.global" }, + { "sxi", "application/vnd.sun.xml.impress" }, + { "sxm", "application/vnd.sun.xml.math" }, + { "sxw", "application/vnd.sun.xml.writer" }, + { "t", "text/troff" }, + { "t3", "application/x-t3vm-image" }, + { "t38", "image/t38" }, + { "taglet", "application/vnd.mynfc" }, + { "tao", "application/vnd.tao.intent-module-archive" }, + { "tap", "image/vnd.tencent.tap" }, + { "tar", "application/x-tar" }, + { "tcap", "application/vnd.3gpp2.tcap" }, + { "tcl", "application/x-tcl" }, + { "td", "application/urc-targetdesc+xml" }, + { "teacher", "application/vnd.smart.teacher" }, + { "tei", "application/tei+xml" }, + { "teicorpus", "application/tei+xml" }, + { "tex", "application/x-tex" }, + { "texi", "application/x-texinfo" }, + { "texinfo", "application/x-texinfo" }, + { "text", "text/plain" }, + { "tfi", "application/thraud+xml" }, + { "tfm", "application/x-tex-tfm" }, + { "tfx", "image/tiff-fx" }, + { "tga", "image/x-tga" }, + { "thmx", "application/vnd.ms-officetheme" }, + { "tif", "image/tiff" }, + { "tiff", "image/tiff" }, + { "tk", "application/x-tcl" }, + { "tmo", "application/vnd.tmobile-livetv" }, + { "toml", "application/toml" }, + { "torrent", "application/x-bittorrent" }, + { "tpl", "application/vnd.groove-tool-template" }, + { "tpt", "application/vnd.trid.tpt" }, + { "tr", "text/troff" }, + { "tra", "application/vnd.trueapp" }, + { "trm", "application/x-msterminal" }, + { "ts", "video/mp2t" }, + { "tsd", "application/timestamped-data" }, + { "tsv", "text/tab-separated-values" }, + { "ttc", "font/collection" }, + { "ttf", "font/ttf" }, + { "ttl", "text/turtle" }, + { "ttml", "application/ttml+xml" }, + { "twd", "application/vnd.simtech-mindmapper" }, + { "twds", "application/vnd.simtech-mindmapper" }, + { "txd", "application/vnd.genomatix.tuxedo" }, + { "txf", "application/vnd.mobius.txf" }, + { "txt", "text/plain" }, + { "u32", "application/x-authorware-bin" }, + { "u8dsn", "message/global-delivery-status" }, + { "u8hdr", "message/global-headers" }, + { "u8mdn", "message/global-disposition-notification" }, + { "u8msg", "message/global" }, + { "ubj", "application/ubjson" }, + { "udeb", "application/x-debian-package" }, + { "ufd", "application/vnd.ufdl" }, + { "ufdl", "application/vnd.ufdl" }, + { "ulx", "application/x-glulx" }, + { "umj", "application/vnd.umajin" }, + { "unityweb", "application/vnd.unity" }, + { "uoml", "application/vnd.uoml+xml" }, + { "uri", "text/uri-list" }, + { "uris", "text/uri-list" }, + { "urls", "text/uri-list" }, + { "usdz", "model/vnd.usdz+zip" }, + { "ustar", "application/x-ustar" }, + { "utz", "application/vnd.uiq.theme" }, + { "uu", "text/x-uuencode" }, + { "uva", "audio/vnd.dece.audio" }, + { "uvd", "application/vnd.dece.data" }, + { "uvf", "application/vnd.dece.data" }, + { "uvg", "image/vnd.dece.graphic" }, + { "uvh", "video/vnd.dece.hd" }, + { "uvi", "image/vnd.dece.graphic" }, + { "uvm", "video/vnd.dece.mobile" }, + { "uvp", "video/vnd.dece.pd" }, + { "uvs", "video/vnd.dece.sd" }, + { "uvt", "application/vnd.dece.ttml+xml" }, + { "uvu", "video/vnd.uvvu.mp4" }, + { "uvv", "video/vnd.dece.video" }, + { "uvva", "audio/vnd.dece.audio" }, + { "uvvd", "application/vnd.dece.data" }, + { "uvvf", "application/vnd.dece.data" }, + { "uvvg", "image/vnd.dece.graphic" }, + { "uvvh", "video/vnd.dece.hd" }, + { "uvvi", "image/vnd.dece.graphic" }, + { "uvvm", "video/vnd.dece.mobile" }, + { "uvvp", "video/vnd.dece.pd" }, + { "uvvs", "video/vnd.dece.sd" }, + { "uvvt", "application/vnd.dece.ttml+xml" }, + { "uvvu", "video/vnd.uvvu.mp4" }, + { "uvvv", "video/vnd.dece.video" }, + { "uvvx", "application/vnd.dece.unspecified" }, + { "uvvz", "application/vnd.dece.zip" }, + { "uvx", "application/vnd.dece.unspecified" }, + { "uvz", "application/vnd.dece.zip" }, + { "vbox", "application/x-virtualbox-vbox" }, + { "vbox-extpack", "application/x-virtualbox-vbox-extpack" }, + { "vcard", "text/vcard" }, + { "vcd", "application/x-cdlink" }, + { "vcf", "text/x-vcard" }, + { "vcg", "application/vnd.groove-vcard" }, + { "vcs", "text/x-vcalendar" }, + { "vcx", "application/vnd.vcx" }, + { "vdi", "application/x-virtualbox-vdi" }, + { "vhd", "application/x-virtualbox-vhd" }, + { "vis", "application/vnd.visionary" }, + { "viv", "video/vnd.vivo" }, + { "vmdk", "application/x-virtualbox-vmdk" }, + { "vob", "video/x-ms-vob" }, + { "vor", "application/vnd.stardivision.writer" }, + { "vox", "application/x-authorware-bin" }, + { "vrml", "model/vrml" }, + { "vsd", "application/vnd.visio" }, + { "vsf", "application/vnd.vsf" }, + { "vss", "application/vnd.visio" }, + { "vst", "application/vnd.visio" }, + { "vsw", "application/vnd.visio" }, + { "vtf", "image/vnd.valve.source.texture" }, + { "vtt", "text/vtt" }, + { "vtu", "model/vnd.vtu" }, + { "vxml", "application/voicexml+xml" }, + { "w3d", "application/x-director" }, + { "wad", "application/x-doom" }, + { "wadl", "application/vnd.sun.wadl+xml" }, + { "war", "application/java-archive" }, + { "wasm", "application/wasm" }, + { "wav", "audio/wav" }, + { "wav", "audio/wave" }, + { "wav", "audio/x-wav" }, + { "wax", "audio/x-ms-wax" }, + { "wbmp", "image/vnd.wap.wbmp" }, + { "wbs", "application/vnd.criticaltools.wbs+xml" }, + { "wbxml", "application/vnd.wap.wbxml" }, + { "wcm", "application/vnd.ms-works" }, + { "wdb", "application/vnd.ms-works" }, + { "wdp", "image/vnd.ms-photo" }, + { "weba", "audio/webm" }, + { "webapp", "application/x-web-app-manifest+json" }, + { "webm", "video/webm" }, + { "webmanifest", "application/manifest+json" }, + { "webp", "image/webp" }, + { "wg", "application/vnd.pmi.widget" }, + { "wgt", "application/widget" }, + { "wks", "application/vnd.ms-works" }, + { "wm", "video/x-ms-wm" }, + { "wma", "audio/x-ms-wma" }, + { "wmd", "application/x-ms-wmd" }, + { "wmf", "application/x-msmetafile" }, + { "wmf", "image/wmf" }, + { "wml", "text/vnd.wap.wml" }, + { "wmlc", "application/vnd.wap.wmlc" }, + { "wmls", "text/vnd.wap.wmlscript" }, + { "wmlsc", "application/vnd.wap.wmlscriptc" }, + { "wmv", "video/x-ms-wmv" }, + { "wmx", "video/x-ms-wmx" }, + { "wmz", "application/x-ms-wmz" }, + { "wmz", "application/x-msmetafile" }, + { "woff", "font/woff" }, + { "woff2", "font/woff2" }, + { "wpd", "application/vnd.wordperfect" }, + { "wpl", "application/vnd.ms-wpl" }, + { "wps", "application/vnd.ms-works" }, + { "wqd", "application/vnd.wqd" }, + { "wri", "application/x-mswrite" }, + { "wrl", "model/vrml" }, + { "wsc", "message/vnd.wfa.wsc" }, + { "wsdl", "application/wsdl+xml" }, + { "wspolicy", "application/wspolicy+xml" }, + { "wtb", "application/vnd.webturbo" }, + { "wvx", "video/x-ms-wvx" }, + { "x32", "application/x-authorware-bin" }, + { "x3d", "model/x3d+xml" }, + { "x3db", "model/x3d+binary" }, + { "x3db", "model/x3d+fastinfoset" }, + { "x3dbz", "model/x3d+binary" }, + { "x3dv", "model/x3d+vrml" }, + { "x3dv", "model/x3d-vrml" }, + { "x3dvz", "model/x3d+vrml" }, + { "x3dz", "model/x3d+xml" }, + { "x_b", "model/vnd.parasolid.transmit.binary" }, + { "x_t", "model/vnd.parasolid.transmit.text" }, + { "xaml", "application/xaml+xml" }, + { "xap", "application/x-silverlight-app" }, + { "xar", "application/vnd.xara" }, + { "xav", "application/xcap-att+xml" }, + { "xbap", "application/x-ms-xbap" }, + { "xbd", "application/vnd.fujixerox.docuworks.binder" }, + { "xbm", "image/x-xbitmap" }, + { "xca", "application/xcap-caps+xml" }, + { "xcs", "application/calendar+xml" }, + { "xdf", "application/mrb-consumer+xml" }, + { "xdf", "application/mrb-publish+xml" }, + { "xdf", "application/xcap-diff+xml" }, + { "xdm", "application/vnd.syncml.dm+xml" }, + { "xdp", "application/vnd.adobe.xdp+xml" }, + { "xdssc", "application/dssc+xml" }, + { "xdw", "application/vnd.fujixerox.docuworks" }, + { "xel", "application/xcap-el+xml" }, + { "xenc", "application/xenc+xml" }, + { "xer", "application/patch-ops-error+xml" }, + { "xer", "application/xcap-error+xml" }, + { "xfdf", "application/vnd.adobe.xfdf" }, + { "xfdl", "application/vnd.xfdl" }, + { "xht", "application/xhtml+xml" }, + { "xhtml", "application/xhtml+xml" }, + { "xhvml", "application/xv+xml" }, + { "xif", "image/vnd.xiff" }, + { "xla", "application/vnd.ms-excel" }, + { "xlam", "application/vnd.ms-excel.addin.macroenabled.12" }, + { "xlc", "application/vnd.ms-excel" }, + { "xlf", "application/x-xliff+xml" }, + { "xlf", "application/xliff+xml" }, + { "xlm", "application/vnd.ms-excel" }, + { "xls", "application/vnd.ms-excel" }, + { "xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12" }, + { "xlsm", "application/vnd.ms-excel.sheet.macroenabled.12" }, + { "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }, + { "xlt", "application/vnd.ms-excel" }, + { "xltm", "application/vnd.ms-excel.template.macroenabled.12" }, + { "xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" }, + { "xlw", "application/vnd.ms-excel" }, + { "xm", "audio/xm" }, + { "xml", "application/xml" }, + { "xml", "text/xml" }, + { "xns", "application/xcap-ns+xml" }, + { "xo", "application/vnd.olpc-sugar" }, + { "xop", "application/xop+xml" }, + { "xpi", "application/x-xpinstall" }, + { "xpl", "application/xproc+xml" }, + { "xpm", "image/x-xpixmap" }, + { "xpr", "application/vnd.is-xpr" }, + { "xps", "application/vnd.ms-xpsdocument" }, + { "xpw", "application/vnd.intercon.formnet" }, + { "xpx", "application/vnd.intercon.formnet" }, + { "xsd", "application/xml" }, + { "xsl", "application/xml" }, + { "xsl", "application/xslt+xml" }, + { "xslt", "application/xslt+xml" }, + { "xsm", "application/vnd.syncml+xml" }, + { "xspf", "application/xspf+xml" }, + { "xul", "application/vnd.mozilla.xul+xml" }, + { "xvm", "application/xv+xml" }, + { "xvml", "application/xv+xml" }, + { "xwd", "image/x-xwindowdump" }, + { "xyz", "chemical/x-xyz" }, + { "xz", "application/x-xz" }, + { "yaml", "text/yaml" }, + { "yang", "application/yang" }, + { "yin", "application/yin+xml" }, + { "yml", "text/yaml" }, + { "ymp", "text/x-suse-ymp" }, + { "z1", "application/x-zmachine" }, + { "z2", "application/x-zmachine" }, + { "z3", "application/x-zmachine" }, + { "z4", "application/x-zmachine" }, + { "z5", "application/x-zmachine" }, + { "z6", "application/x-zmachine" }, + { "z7", "application/x-zmachine" }, + { "z8", "application/x-zmachine" }, + { "zaz", "application/vnd.zzazz.deck+xml" }, + { "zip", "application/zip" }, + { "zir", "application/vnd.zul" }, + { "zirz", "application/vnd.zul" }, + { "zmm", "application/vnd.handheld-entertainment+xml" } +}; diff --git a/libtransmission/mime-types.h b/libtransmission/mime-types.h new file mode 100644 index 000000000..c0c3408a5 --- /dev/null +++ b/libtransmission/mime-types.h @@ -0,0 +1,19 @@ +/* + * This file Copyright (C) 2020 Mnemosyne LLC + * + * It may be used under the GNU GPL versions 2 or 3 + * or any future license endorsed by Mnemosyne LLC. + */ + +#pragma once + +#define MIME_TYPE_SUFFIX_MAXLEN 24 +#define MIME_TYPE_SUFFIX_COUNT 1201 + +struct mime_type_suffix +{ + char const* suffix; + char const* mime_type; +}; + +extern struct mime_type_suffix const mime_type_suffixes[MIME_TYPE_SUFFIX_COUNT]; diff --git a/libtransmission/mime-types.js b/libtransmission/mime-types.js new file mode 100755 index 000000000..4910551cc --- /dev/null +++ b/libtransmission/mime-types.js @@ -0,0 +1,72 @@ +#!/usr/bin/env node + +const copyright = +`/* + * This file Copyright (C) ${new Date().getFullYear()} Mnemosyne LLC + * + * It may be used under the GNU GPL versions 2 or 3 + * or any future license endorsed by Mnemosyne LLC. + */`; + +const fs = require('fs'); +const https = require('https'); + +// https://github.com/jshttp/mime-db +// > If you're crazy enough to use this in the browser, you can just grab +// > the JSON file using jsDelivr. It is recommended to replace master with +// > a release tag as the JSON format may change in the future. +// +// This script keeps it at `master` to pick up any fixes that may have landed. +// If the format changes, we'll just update this script. +const url = 'https://cdn.jsdelivr.net/gh/jshttp/mime-db@master/db.json'; + +https.get(url, (res) => { + res.setEncoding('utf8'); + const chunks = []; + res.on('data', (chunk) => chunks.push(chunk)); + res.on('end', () => { + try { + const suffixes = []; + const mime_types = JSON.parse(chunks.join('')); + for (const [mime_type, info] of Object.entries(mime_types)) { + for (const suffix of info?.extensions || []) { + suffixes.push([ suffix, mime_type ]); + } + } + + const max_suffix_len = suffixes + .reduce((acc, [suffix]) => Math.max(acc, suffix.length), 0); + + const mime_type_lines = suffixes + .map(([suffix, mime_type]) => ` { "${suffix}", "${mime_type}" }`) + .sort() + .join(',\n'); + fs.writeFileSync('mime-types.c', `${copyright} + +#include "mime-types.h" + +struct mime_type_suffix const mime_type_suffixes[MIME_TYPE_SUFFIX_COUNT] = +{ +${mime_type_lines} +}; +`); + fs.writeFileSync('mime-types.h', `${copyright} + +#pragma once + +#define MIME_TYPE_SUFFIX_MAXLEN ${max_suffix_len} +#define MIME_TYPE_SUFFIX_COUNT ${suffixes.length} + +struct mime_type_suffix +{ + char const* suffix; + char const* mime_type; +}; + +extern struct mime_type_suffix const mime_type_suffixes[MIME_TYPE_SUFFIX_COUNT]; +`); + } catch (e) { + console.error(e.message); + } + }); +}); diff --git a/libtransmission/quark.c b/libtransmission/quark.c index 547a3e8e2..8d79a3d8e 100644 --- a/libtransmission/quark.c +++ b/libtransmission/quark.c @@ -116,6 +116,7 @@ static struct tr_key_struct const my_static[] = Q("etaIdle"), Q("failure reason"), Q("fields"), + Q("file-count"), Q("fileStats"), Q("filename"), Q("files"), @@ -255,6 +256,7 @@ static struct tr_key_struct const my_static[] = Q("port-is-open"), Q("preallocation"), Q("prefetch-enabled"), + Q("primary-mime-type"), Q("priorities"), Q("priority"), Q("priority-high"), diff --git a/libtransmission/quark.h b/libtransmission/quark.h index 767e065cb..45466532c 100644 --- a/libtransmission/quark.h +++ b/libtransmission/quark.h @@ -115,6 +115,7 @@ enum TR_KEY_etaIdle, TR_KEY_failure_reason, TR_KEY_fields, + TR_KEY_file_count, TR_KEY_fileStats, TR_KEY_filename, TR_KEY_files, @@ -254,6 +255,7 @@ enum TR_KEY_port_is_open, TR_KEY_preallocation, TR_KEY_prefetch_enabled, + TR_KEY_primary_mime_type, TR_KEY_priorities, TR_KEY_priority, TR_KEY_priority_high, diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c index 2e35df8c0..560c2e6a3 100644 --- a/libtransmission/rpcimpl.c +++ b/libtransmission/rpcimpl.c @@ -640,6 +640,10 @@ static void initField(tr_torrent* const tor, tr_info const* const inf, tr_stat c tr_variantInitInt(initme, st->eta); break; + case TR_KEY_file_count: + tr_variantInitInt(initme, inf->fileCount); + break; + case TR_KEY_files: tr_variantInitList(initme, inf->fileCount); addFiles(tor, initme); @@ -779,6 +783,10 @@ static void initField(tr_torrent* const tor, tr_info const* const inf, tr_stat c tr_variantInitInt(initme, inf->pieceSize); break; + case TR_KEY_primary_mime_type: + tr_variantInitStr(initme, tr_torrentPrimaryMimeType(tor), TR_BAD_SIZE); + break; + case TR_KEY_priorities: tr_variantInitList(initme, inf->fileCount); for (tr_file_index_t i = 0; i < inf->fileCount; ++i) diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index c79edf5f9..c4f785bd3 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -3378,6 +3378,58 @@ void tr_torrentSetLocation(tr_torrent* tor, char const* location, bool move_from tr_runInEventThread(tor->session, setLocation, data); } +char const* tr_torrentPrimaryMimeType(tr_torrent const* tor) +{ + struct count + { + uint64_t length; + char const* mime_type; + }; + + tr_info const* inf = &tor->info; + struct count* counts = tr_new0(struct count, inf->fileCount); + size_t num_counts = 0; + + for (tr_file const* it = inf->files, * end = it + inf->fileCount; it != end; ++it) + { + char const* mime_type = tr_get_mime_type_for_filename(it->name); + size_t i; + for (i = 0; i < num_counts; ++i) + { + if (counts[i].mime_type == mime_type) + { + counts[i].length += it->length; + break; + } + } + + if (i == num_counts) + { + counts[i].mime_type = mime_type; + counts[i].length = it->length; + ++num_counts; + } + } + + uint64_t max_len = 0; + char const* mime_type = NULL; + for (struct count const* it = counts, *end = it + num_counts; it != end; ++it) + { + if ((max_len < it->length) && (it->mime_type != NULL)) + { + max_len = it->length; + mime_type = it->mime_type; + } + } + + tr_free(counts); + + // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types + // application/octet-stream is the default value for all other cases. + // An unknown file type should use this type. + return mime_type != NULL ? mime_type : "application/octet-stream"; +} + /*** **** ***/ diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index 116a96097..3a019b078 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -96,6 +96,10 @@ void tr_torrentSetDateActive(tr_torrent* torrent, time_t activityDate); void tr_torrentSetDateDone(tr_torrent* torrent, time_t doneDate); +/** Return the mime-type (e.g. "audio/x-flac") that matches more of the + torrent's content than any other mime-type. */ +char const* tr_torrentPrimaryMimeType(tr_torrent const* tor); + typedef enum { TR_VERIFY_NONE, diff --git a/libtransmission/utils.c b/libtransmission/utils.c index 0eaccbd12..f8b63fefb 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -49,6 +49,7 @@ #include "ConvertUTF.h" #include "list.h" #include "log.h" +#include "mime-types.h" #include "net.h" #include "platform.h" /* tr_lockLock() */ #include "platform-quota.h" /* tr_device_info_create(), tr_device_info_get_free_space(), tr_device_info_free() */ @@ -2254,3 +2255,38 @@ void tr_net_init(void) initialized = true; } } + +/// mime-type + +static int compareSuffix(void const* va, void const* vb) +{ + char const* suffix = va; + struct mime_type_suffix const* entry = vb; + return tr_strcmp0(suffix, entry->suffix); +} + +char const* tr_get_mime_type_for_filename(char const* filename) +{ + struct mime_type_suffix const* info = NULL; + + char const* in = strrchr(filename, '.'); + if ((in != NULL) && (strlen(++in) <= MIME_TYPE_SUFFIX_MAXLEN)) + { + char lowercase_suffix[MIME_TYPE_SUFFIX_MAXLEN + 1]; + char* out = lowercase_suffix; + while (*in != '\0') + { + *out++ = tolower((unsigned char)*in++); + } + + *out = '\0'; + + info = bsearch(lowercase_suffix, + mime_type_suffixes, + TR_N_ELEMENTS(mime_type_suffixes), + sizeof(*mime_type_suffixes), + compareSuffix); + } + + return info != NULL ? info->mime_type : NULL; +} diff --git a/libtransmission/utils.h b/libtransmission/utils.h index 550123456..b4fa62475 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -60,6 +60,8 @@ char const* tr_strip_positional_args(char const* fmt); #define TR_N_ELEMENTS(ary) (sizeof(ary) / sizeof(*(ary))) +char const* tr_get_mime_type_for_filename(char const* filename); + /** * @brief Rich Salz's classic implementation of shell-style pattern matching for ?, \, [], and * characters. * @return 1 if the pattern matches, 0 if it doesn't, or -1 if an error occured diff --git a/qt/IconCache.cc b/qt/IconCache.cc index 6f500f62c..87d386641 100644 --- a/qt/IconCache.cc +++ b/qt/IconCache.cc @@ -17,14 +17,14 @@ #include #include #include +#include #include +#include +#include #ifdef _WIN32 #include #include -#else -#include -#include #endif #include @@ -75,6 +75,58 @@ QIcon IconCache::guessMimeIcon(QString const& filename, QIcon fallback) const return icon; } +QIcon IconCache::getMimeTypeIcon(QString const& mime_type_name, bool multifile) const +{ + auto& icon = (multifile ? name_to_emblem_icon_ : name_to_icon_)[mime_type_name]; + + if (!icon.isNull()) + { + return icon; + } + + if (!multifile) + { + QMimeDatabase mime_db; + auto const type = mime_db.mimeTypeForName(mime_type_name); + icon = QIcon::fromTheme(type.iconName()); + + if (icon.isNull()) + { + icon = QIcon::fromTheme(type.genericIconName()); + } + + if (icon.isNull()) + { + icon = file_icon_; + } + + return icon; + } + + auto const mime_icon = getMimeTypeIcon(mime_type_name, false); + for (auto const& size : { QSize(24, 24), QSize(32, 32), QSize(48, 48) }) + { + // upper left corner + auto const folder_size = size / 2; + auto const folder_rect = QRect(QPoint(), folder_size); + + // fullsize + auto const mime_size = size; + auto const mime_rect = QRect(QPoint(), mime_size); + + // build the icon + auto pixmap = QPixmap(size); + pixmap.fill(Qt::transparent); + QPainter painter(&pixmap); + painter.setRenderHints(QPainter::SmoothPixmapTransform); + painter.drawPixmap(folder_rect, folder_icon_.pixmap(folder_size)); + painter.drawPixmap(mime_rect, mime_icon.pixmap(mime_size)); + icon.addPixmap(pixmap); + } + + return icon; +} + /*** **** ***/ @@ -132,11 +184,11 @@ QIcon IconCache::getMimeIcon(QString const& filename) const return {}; } - QIcon& icon = icon_cache_[ext]; + QIcon& icon = ext_to_icon_[ext]; if (icon.isNull()) // cache miss { QMimeDatabase mime_db; - QMimeType type = mime_db.mimeTypeForFile(filename, QMimeDatabase::MatchExtension); + auto const type = mime_db.mimeTypeForFile(filename, QMimeDatabase::MatchExtension); if (icon.isNull()) { icon = QIcon::fromTheme(type.iconName()); diff --git a/qt/IconCache.h b/qt/IconCache.h index f17e11908..cc4d80693 100644 --- a/qt/IconCache.h +++ b/qt/IconCache.h @@ -30,6 +30,7 @@ public: QIcon folderIcon() const { return folder_icon_; } QIcon fileIcon() const { return file_icon_; } QIcon guessMimeIcon(QString const& filename, QIcon fallback = {}) const; + QIcon getMimeTypeIcon(QString const& mime_type, bool multifile) const; protected: IconCache(); @@ -38,11 +39,14 @@ private: QIcon const folder_icon_; QIcon const file_icon_; + mutable std::unordered_map name_to_icon_; + mutable std::unordered_map name_to_emblem_icon_; + #if defined(_WIN32) void addAssociatedFileIcon(QFileInfo const& file_info, UINT icon_size, QIcon& icon) const; #else - mutable std::unordered_map icon_cache_; mutable std::unordered_set suffixes_; + mutable std::unordered_map ext_to_icon_; QIcon getMimeIcon(QString const& filename) const; #endif }; diff --git a/qt/Session.cc b/qt/Session.cc index 036cfe4c4..327b60dd3 100644 --- a/qt/Session.cc +++ b/qt/Session.cc @@ -539,11 +539,13 @@ std::vector const& Session::getKeyNames(TorrentProperties prop if (names.empty()) { // unchanging fields needed by the main window - static auto constexpr MainInfoKeys = std::array{ + static auto constexpr MainInfoKeys = std::array{ TR_KEY_addedDate, TR_KEY_downloadDir, + TR_KEY_file_count, TR_KEY_hashString, TR_KEY_name, + TR_KEY_primary_mime_type, TR_KEY_totalSize, TR_KEY_trackers, }; diff --git a/qt/Torrent.cc b/qt/Torrent.cc index 790e57958..58490be84 100644 --- a/qt/Torrent.cc +++ b/qt/Torrent.cc @@ -165,21 +165,7 @@ QIcon Torrent::getMimeTypeIcon() const { if (icon_.isNull()) { - auto const& files = files_; - auto const& icon_cache = IconCache::get(); - - if (files.size() > 1) - { - icon_ = icon_cache.folderIcon(); - } - else if (files.size() == 1) - { - icon_ = icon_cache.guessMimeIcon(files.at(0).filename, icon_cache.fileIcon()); - } - else - { - icon_ = icon_cache.guessMimeIcon(name(), icon_cache.folderIcon()); - } + icon_ = IconCache::get().getMimeTypeIcon(primary_mime_type_, file_count_ > 1); } return icon_; @@ -220,6 +206,7 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const* HANDLE_KEY(eta, eta, ETA) HANDLE_KEY(fileStats, files, FILES) HANDLE_KEY(files, files, FILES) + HANDLE_KEY(file_count, file_count, FILE_COUNT) HANDLE_KEY(hashString, hash, HASH) HANDLE_KEY(haveUnchecked, have_unchecked, HAVE_UNCHECKED) HANDLE_KEY(haveValid, have_verified, HAVE_VERIFIED) @@ -239,6 +226,7 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const* HANDLE_KEY(percentDone, percent_done, PERCENT_DONE) HANDLE_KEY(pieceCount, piece_count, PIECE_COUNT) HANDLE_KEY(pieceSize, piece_size, PIECE_SIZE) + HANDLE_KEY(primary_mime_type, primary_mime_type, PRIMARY_MIME_TYPE) HANDLE_KEY(queuePosition, queue_position, QUEUE_POSITION) HANDLE_KEY(rateDownload, download_speed, DOWNLOAD_SPEED) HANDLE_KEY(rateUpload, upload_speed, UPLOAD_SPEED) @@ -282,7 +270,8 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const* { switch (key) { - case TR_KEY_name: + case TR_KEY_file_count: + case TR_KEY_primary_mime_type: { icon_ = {}; break; @@ -290,7 +279,6 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const* case TR_KEY_files: { - icon_ = {}; for (int i = 0; i < files_.size(); ++i) { files_[i].index = i; diff --git a/qt/Torrent.h b/qt/Torrent.h index aaea860d5..ec0b75b2f 100644 --- a/qt/Torrent.h +++ b/qt/Torrent.h @@ -561,6 +561,7 @@ public: ERROR_STRING, ETA, FAILED_EVER, + FILE_COUNT, FILES, HASH, HAVE_UNCHECKED, @@ -582,6 +583,7 @@ public: PERCENT_DONE, PIECE_COUNT, PIECE_SIZE, + PRIMARY_MIME_TYPE, QUEUE_POSITION, RECHECK_PROGRESS, SEED_IDLE_LIMIT, @@ -642,6 +644,7 @@ private: uint64_t desired_available_ = {}; uint64_t downloaded_ever_ = {}; uint64_t failed_ever_ = {}; + uint64_t file_count_ = {}; uint64_t have_unchecked_ = {}; uint64_t have_verified_ = {}; uint64_t left_until_done_ = {}; @@ -655,6 +658,7 @@ private: double recheck_progress_ = {}; double seed_ratio_limit_ = {}; + QString primary_mime_type_; QString comment_; QString creator_; QString download_dir_; diff --git a/tests/libtransmission/utils-test.cc b/tests/libtransmission/utils-test.cc index 722675105..7ec472282 100644 --- a/tests/libtransmission/utils-test.cc +++ b/tests/libtransmission/utils-test.cc @@ -442,3 +442,12 @@ TEST_F(UtilsTest, env) s = makeString(tr_env_get_string(test_key, "c")); EXPECT_EQ("135", s); } + +TEST_F(UtilsTest, mimeTypes) +{ + EXPECT_STREQ("audio/x-flac", tr_get_mime_type_for_filename("music.flac")); + EXPECT_STREQ("audio/x-flac", tr_get_mime_type_for_filename("music.FLAC")); + EXPECT_STREQ("video/x-msvideo", tr_get_mime_type_for_filename(".avi")); + EXPECT_STREQ("video/x-msvideo", tr_get_mime_type_for_filename("/path/to/FILENAME.AVI")); + EXPECT_EQ(nullptr, tr_get_mime_type_for_filename("music.ajoijfeisfe")); +}