diff --git a/app/datasets/mimetypes.json b/app/datasets/mimetypes.json index d0355ed82..e8f49e314 100644 --- a/app/datasets/mimetypes.json +++ b/app/datasets/mimetypes.json @@ -6,78 +6,37 @@ "image/png", "image/jpeg", "image/gif", - "application/vnd.lotus-1-2-3", "application/andrew-inset", "application/applixware", "application/atom+xml", "application/atomcat+xml", "application/atomsvc+xml", "application/bdoc", - "application/ccxml+xml", - "application/cdmi-capability", - "application/cdmi-container", - "application/cdmi-domain", - "application/cdmi-object", - "application/cdmi-queue", "application/cu-seeme", "application/dash+xml", "application/davmount+xml", "application/docbook+xml", - "application/dssc+der", "application/dssc+xml", "application/ecmascript", - "application/emma+xml", "application/epub+zip", "application/exi", "application/font-tdpfr", "application/font-woff", "application/font-woff2", "application/geo+json", - "application/gml+xml", - "application/gpx+xml", - "application/gxf", - "application/hyperstudio", - "application/inkml+xml", - "application/ipfix", - "application/java-archive", "application/java-serialized-object", - "application/java-vm", "application/javascript", "application/json5", "application/jsonml+json", "application/ld+json", "application/lost+xml", - "application/mac-binhex40", - "application/mac-compactpro", - "application/mads+xml", "application/manifest+json", - "application/marc", - "application/marcxml+xml", - "application/mathematica", - "application/mathml+xml", - "application/mbox", - "application/mediaservercontrol+xml", - "application/metalink+xml", - "application/metalink4+xml", - "application/mets+xml", - "application/mods+xml", - "application/mp21", "application/mp4", "application/msword", "application/mxf", "application/octet-stream", - "application/x-msdos-program", - "application/x-msdownload", - "application/x-debian-package", - "application/x-apple-diskimage", - "application/x-iso9660-image", "application/oda", - "application/oebps-package+xml", "application/ogg", - "application/omdoc+xml", - "application/onenote", - "application/oxps", - "application/patch-ops-error+xml", "application/pdf", "application/pgp-encrypted", "application/pgp-signature", @@ -86,534 +45,78 @@ "application/pkcs7-mime", "application/pkcs7-signature", "application/pkcs8", - "application/pkix-attr-cert", - "application/pkix-cert", - "application/pkix-crl", - "application/pkix-pkipath", - "application/pkixcmp", - "application/pls+xml", "application/postscript", - "application/prs.cww", "application/pskc+xml", - "application/rdf+xml", - "application/reginfo+xml", - "application/relax-ng-compact-syntax", "application/resource-lists+xml", "application/resource-lists-diff+xml", "application/rls-services+xml", - "application/rpki-ghostbusters", - "application/rpki-manifest", - "application/rpki-roa", "application/rsd+xml", "application/rss+xml", "application/rtf", - "application/sbml+xml", - "application/scvp-cv-request", - "application/scvp-cv-response", - "application/scvp-vp-request", - "application/scvp-vp-response", "application/sdp", - "application/set-payment-initiation", - "application/set-registration-initiation", "application/shf+xml", - "application/smil+xml", - "application/sparql-query", - "application/sparql-results+xml", - "application/srgs", - "application/srgs+xml", - "application/sru+xml", - "application/ssdl+xml", - "application/ssml+xml", - "application/tei+xml", - "application/thraud+xml", "application/timestamped-data", - "application/vnd.3gpp.pic-bw-large", - "application/vnd.3gpp.pic-bw-small", - "application/vnd.3gpp.pic-bw-var", - "application/vnd.3gpp2.tcap", - "application/vnd.3m.post-it-notes", - "application/vnd.accpac.simply.aso", - "application/vnd.accpac.simply.imp", - "application/vnd.acucobol", - "application/vnd.acucorp", - "application/vnd.adobe.air-application-installer-package+zip", - "application/vnd.adobe.formscentral.fcdt", - "application/vnd.adobe.fxp", - "application/vnd.adobe.xdp+xml", - "application/vnd.adobe.xfdf", - "application/vnd.ahead.space", - "application/vnd.airzip.filesecure.azf", - "application/vnd.airzip.filesecure.azs", - "application/vnd.amazon.ebook", - "application/vnd.americandynamics.acc", - "application/vnd.amiga.ami", "application/vnd.android.package-archive", - "application/vnd.anser-web-certificate-issue-initiation", - "application/vnd.anser-web-funds-transfer-initiation", - "application/vnd.antix.game-component", "application/vnd.apple.installer+xml", "application/vnd.apple.mpegurl", "application/vnd.apple.pkpass", - "application/vnd.aristanetworks.swi", - "application/vnd.astraea-software.iota", - "application/vnd.audiograph", - "application/vnd.blueice.multipass", "application/vnd.bmi", - "application/vnd.businessobjects", - "application/vnd.chemdraw+xml", - "application/vnd.chipnuts.karaoke-mmd", - "application/vnd.cinderella", - "application/vnd.claymore", - "application/vnd.cloanto.rp9", - "application/vnd.clonk.c4group", - "application/vnd.cluetrust.cartomobile-config", - "application/vnd.cluetrust.cartomobile-config-pkg", - "application/vnd.commonspace", - "application/vnd.contact.cmsg", - "application/vnd.cosmocaller", - "application/vnd.crick.clicker", - "application/vnd.crick.clicker.keyboard", - "application/vnd.crick.clicker.palette", - "application/vnd.crick.clicker.template", - "application/vnd.crick.clicker.wordbank", - "application/vnd.criticaltools.wbs+xml", - "application/vnd.ctc-posml", - "application/vnd.cups-ppd", "application/vnd.curl.car", "application/vnd.curl.pcurl", - "application/vnd.dart", - "application/vnd.data-vision.rdz", - "application/vnd.dece.data", - "application/vnd.dece.ttml+xml", - "application/vnd.dece.unspecified", - "application/vnd.dece.zip", - "application/vnd.denovo.fcselayout-link", "application/vnd.dna", - "application/vnd.dolby.mlp", - "application/vnd.dpgraph", - "application/vnd.dreamfactory", - "application/vnd.ds-keypoint", - "application/vnd.dvb.ait", - "application/vnd.dvb.service", - "application/vnd.dynageo", - "application/vnd.ecowin.chart", - "application/vnd.enliven", - "application/vnd.epson.esf", - "application/vnd.epson.msf", - "application/vnd.epson.quickanime", - "application/vnd.epson.salt", - "application/vnd.epson.ssf", - "application/vnd.eszigno3+xml", - "application/vnd.ezpix-album", - "application/vnd.ezpix-package", - "application/vnd.fdf", - "application/vnd.fdsn.mseed", - "application/vnd.fdsn.seed", - "application/vnd.flographit", - "application/vnd.fluxtime.clip", - "application/vnd.framemaker", - "application/vnd.frogans.fnc", - "application/vnd.frogans.ltf", - "application/vnd.fsc.weblaunch", - "application/vnd.fujitsu.oasys", - "application/vnd.fujitsu.oasys2", - "application/vnd.fujitsu.oasys3", - "application/vnd.fujitsu.oasysgp", - "application/vnd.fujitsu.oasysprs", - "application/vnd.fujixerox.ddd", - "application/vnd.fujixerox.docuworks", - "application/vnd.fujixerox.docuworks.binder", - "application/vnd.fuzzysheet", - "application/vnd.genomatix.tuxedo", - "application/vnd.geogebra.file", - "application/vnd.geogebra.tool", - "application/vnd.geometry-explorer", - "application/vnd.geonext", - "application/vnd.geoplan", - "application/vnd.geospace", - "application/vnd.gmx", "application/vnd.google-apps.document", "application/vnd.google-apps.presentation", "application/vnd.google-apps.spreadsheet", - "application/vnd.google-earth.kml+xml", - "application/vnd.google-earth.kmz", - "application/vnd.grafeq", - "application/vnd.groove-account", - "application/vnd.groove-help", - "application/vnd.groove-identity-message", - "application/vnd.groove-injector", - "application/vnd.groove-tool-message", - "application/vnd.groove-tool-template", - "application/vnd.groove-vcard", "application/vnd.hal+xml", "application/vnd.handheld-entertainment+xml", - "application/vnd.hbci", - "application/vnd.hhe.lesson-player", - "application/vnd.hp-hpgl", - "application/vnd.hp-hpid", - "application/vnd.hp-hps", - "application/vnd.hp-jlyt", - "application/vnd.hp-pcl", - "application/vnd.hp-pclxl", - "application/vnd.hydrostatix.sof-data", - "application/vnd.ibm.minipay", - "application/vnd.ibm.modcap", - "application/vnd.ibm.rights-management", - "application/vnd.ibm.secure-container", - "application/vnd.iccprofile", - "application/vnd.igloader", - "application/vnd.immervision-ivp", - "application/vnd.immervision-ivu", - "application/vnd.insors.igm", - "application/vnd.intercon.formnet", - "application/vnd.intergeo", - "application/vnd.intu.qbo", - "application/vnd.intu.qfx", - "application/vnd.ipunplugged.rcprofile", - "application/vnd.irepository.package+xml", - "application/vnd.is-xpr", - "application/vnd.isac.fcs", - "application/vnd.jam", - "application/vnd.jcp.javame.midlet-rms", - "application/vnd.jisp", - "application/vnd.joost.joda-archive", - "application/vnd.kahootz", - "application/vnd.kde.karbon", - "application/vnd.kde.kchart", - "application/vnd.kde.kformula", - "application/vnd.kde.kivio", - "application/vnd.kde.kontour", - "application/vnd.kde.kpresenter", - "application/vnd.kde.kspread", - "application/vnd.kde.kword", - "application/vnd.kenameaapp", - "application/vnd.kidspiration", - "application/vnd.kinar", - "application/vnd.koan", - "application/vnd.kodak-descriptor", - "application/vnd.las.las+xml", - "application/vnd.llamagraphics.life-balance.desktop", - "application/vnd.llamagraphics.life-balance.exchange+xml", - "application/vnd.lotus-approach", - "application/vnd.lotus-freelance", - "application/vnd.lotus-notes", - "application/vnd.lotus-organizer", - "application/vnd.lotus-screencam", - "application/vnd.lotus-wordpro", "application/vnd.macports.portpkg", - "application/vnd.mcd", - "application/vnd.medcalcdata", - "application/vnd.mediastation.cdkey", - "application/vnd.mfer", - "application/vnd.mfmp", - "application/vnd.micrografx.flo", - "application/vnd.micrografx.igx", - "application/vnd.mif", - "application/vnd.mobius.daf", - "application/vnd.mobius.dis", - "application/vnd.mobius.mbk", - "application/vnd.mobius.mqy", - "application/vnd.mobius.msl", - "application/vnd.mobius.plc", - "application/vnd.mobius.txf", - "application/vnd.mophun.application", - "application/vnd.mophun.certificate", "application/vnd.mozilla.xul+xml", - "application/vnd.ms-artgalry", - "application/vnd.ms-cab-compressed", - "application/vnd.ms-excel", - "application/vnd.ms-excel.addin.macroenabled.12", - "application/vnd.ms-excel.sheet.binary.macroenabled.12", - "application/vnd.ms-excel.sheet.macroenabled.12", - "application/vnd.ms-excel.template.macroenabled.12", - "application/vnd.ms-fontobject", - "application/vnd.ms-htmlhelp", - "application/vnd.ms-ims", - "application/vnd.ms-lrm", - "application/vnd.ms-officetheme", - "application/vnd.ms-pki.seccat", - "application/vnd.ms-pki.stl", - "application/vnd.ms-powerpoint", - "application/vnd.ms-powerpoint.addin.macroenabled.12", - "application/vnd.ms-powerpoint.presentation.macroenabled.12", - "application/vnd.ms-powerpoint.slide.macroenabled.12", - "application/vnd.ms-powerpoint.slideshow.macroenabled.12", - "application/vnd.ms-powerpoint.template.macroenabled.12", - "application/vnd.ms-project", - "application/vnd.ms-word.document.macroenabled.12", - "application/vnd.ms-word.template.macroenabled.12", - "application/vnd.ms-works", - "application/vnd.ms-wpl", - "application/vnd.ms-xpsdocument", - "application/vnd.mseq", - "application/vnd.musician", - "application/vnd.muvee.style", - "application/vnd.mynfc", - "application/vnd.neurolanguage.nlu", - "application/vnd.nitf", - "application/vnd.noblenet-directory", - "application/vnd.noblenet-sealer", - "application/vnd.noblenet-web", - "application/vnd.nokia.n-gage.data", - "application/vnd.nokia.n-gage.symbian.install", - "application/vnd.nokia.radio-preset", - "application/vnd.nokia.radio-presets", - "application/vnd.novadigm.edm", - "application/vnd.novadigm.edx", - "application/vnd.novadigm.ext", - "application/vnd.oasis.opendocument.chart", - "application/vnd.oasis.opendocument.chart-template", - "application/vnd.oasis.opendocument.database", - "application/vnd.oasis.opendocument.formula", - "application/vnd.oasis.opendocument.formula-template", - "application/vnd.oasis.opendocument.graphics", - "application/vnd.oasis.opendocument.graphics-template", - "application/vnd.oasis.opendocument.image", - "application/vnd.oasis.opendocument.image-template", - "application/vnd.oasis.opendocument.presentation", - "application/vnd.oasis.opendocument.presentation-template", - "application/vnd.oasis.opendocument.spreadsheet", - "application/vnd.oasis.opendocument.spreadsheet-template", - "application/vnd.oasis.opendocument.text", - "application/vnd.oasis.opendocument.text-master", - "application/vnd.oasis.opendocument.text-template", - "application/vnd.oasis.opendocument.text-web", - "application/vnd.olpc-sugar", - "application/vnd.oma.dd2+xml", - "application/vnd.openofficeorg.extension", - "application/vnd.openxmlformats-officedocument.presentationml.presentation", - "application/vnd.openxmlformats-officedocument.presentationml.slide", - "application/vnd.openxmlformats-officedocument.presentationml.slideshow", - "application/vnd.openxmlformats-officedocument.presentationml.template", - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - "application/vnd.openxmlformats-officedocument.spreadsheetml.template", - "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - "application/vnd.openxmlformats-officedocument.wordprocessingml.template", - "application/vnd.osgeo.mapguide.package", - "application/vnd.osgi.dp", - "application/vnd.osgi.subsystem", - "application/vnd.palm", - "application/vnd.pawaafile", - "application/vnd.pg.format", - "application/vnd.pg.osasli", - "application/vnd.picsel", - "application/vnd.pmi.widget", - "application/vnd.pocketlearn", - "application/vnd.powerbuilder6", - "application/vnd.previewsystems.box", - "application/vnd.proteus.magazine", - "application/vnd.publishare-delta-tree", - "application/vnd.pvi.ptid1", - "application/vnd.quark.quarkxpress", - "application/vnd.realvnc.bed", - "application/vnd.recordare.musicxml", - "application/vnd.recordare.musicxml+xml", - "application/vnd.rig.cryptonote", - "application/vnd.rim.cod", - "application/vnd.rn-realmedia", - "application/vnd.rn-realmedia-vbr", - "application/vnd.route66.link66+xml", - "application/vnd.sailingtracker.track", - "application/vnd.seemail", - "application/vnd.sema", - "application/vnd.semd", - "application/vnd.semf", - "application/vnd.shana.informed.formdata", - "application/vnd.shana.informed.formtemplate", - "application/vnd.shana.informed.interchange", - "application/vnd.shana.informed.package", - "application/vnd.simtech-mindmapper", - "application/vnd.smaf", - "application/vnd.smart.teacher", - "application/vnd.solent.sdkm+xml", - "application/vnd.spotfire.dxp", - "application/vnd.spotfire.sfs", - "application/vnd.stardivision.calc", - "application/vnd.stardivision.draw", - "application/vnd.stardivision.impress", - "application/vnd.stardivision.math", - "application/vnd.stardivision.writer", - "application/vnd.stardivision.writer-global", - "application/vnd.stepmania.package", - "application/vnd.stepmania.stepchart", - "application/vnd.sun.xml.calc", - "application/vnd.sun.xml.calc.template", - "application/vnd.sun.xml.draw", - "application/vnd.sun.xml.draw.template", - "application/vnd.sun.xml.impress", - "application/vnd.sun.xml.impress.template", - "application/vnd.sun.xml.math", - "application/vnd.sun.xml.writer", - "application/vnd.sun.xml.writer.global", - "application/vnd.sun.xml.writer.template", - "application/vnd.sus-calendar", - "application/vnd.svd", - "application/vnd.symbian.install", - "application/vnd.syncml+xml", - "application/vnd.syncml.dm+wbxml", - "application/vnd.syncml.dm+xml", - "application/vnd.tao.intent-module-archive", - "application/vnd.tcpdump.pcap", - "application/vnd.tmobile-livetv", - "application/vnd.trid.tpt", - "application/vnd.triscape.mxs", - "application/vnd.trueapp", - "application/vnd.ufdl", - "application/vnd.uiq.theme", - "application/vnd.umajin", "application/vnd.unity", - "application/vnd.uoml+xml", - "application/vnd.vcx", - "application/vnd.visio", - "application/vnd.visionary", - "application/vnd.vsf", - "application/vnd.wap.wbxml", - "application/vnd.wap.wmlc", - "application/vnd.wap.wmlscriptc", "application/vnd.webturbo", "application/vnd.wolfram.player", - "application/vnd.wordperfect", - "application/vnd.wqd", - "application/vnd.wt.stf", - "application/vnd.xara", - "application/vnd.xfdl", - "application/vnd.yamaha.hv-dic", - "application/vnd.yamaha.hv-script", - "application/vnd.yamaha.hv-voice", - "application/vnd.yamaha.openscoreformat", - "application/vnd.yamaha.openscoreformat.osfpvg+xml", - "application/vnd.yamaha.smaf-audio", - "application/vnd.yamaha.smaf-phrase", - "application/vnd.yellowriver-custom-menu", "application/vnd.zul", - "application/vnd.zzazz.deck+xml", - "application/voicexml+xml", "application/widget", - "application/winhlp", "application/wsdl+xml", - "application/wspolicy+xml", "application/x-7z-compressed", - "application/x-abiword", "application/x-ace-compressed", - "application/x-authorware-bin", - "application/x-authorware-map", - "application/x-authorware-seg", - "application/x-bcpio", "application/x-bittorrent", - "application/x-blorb", "application/x-bzip", "application/x-bzip2", - "application/x-cbr", - "application/x-cdlink", "application/x-cfs-compressed", - "application/x-chat", - "application/x-chess-pgn", "application/x-chrome-extension", "application/x-cocoa", "application/x-conference", - "application/x-cpio", - "application/x-csh", - "application/x-dgc-compressed", "application/x-director", - "application/x-doom", - "application/x-dtbncx+xml", - "application/x-dtbook+xml", - "application/x-dtbresource+xml", - "application/x-dvi", "application/x-envoy", "application/x-eva", - "application/x-font-bdf", - "application/x-font-ghostscript", - "application/x-font-linux-psf", "font/opentype", - "application/x-font-pcf", - "application/x-font-snf", - "application/x-font-ttf", - "application/x-font-type1", - "application/x-freearc", - "application/x-futuresplash", "application/x-gca-compressed", - "application/x-glulx", - "application/x-gnumeric", - "application/x-gramps-xml", "application/x-gtar", "application/x-hdf", "application/x-httpd-php", "application/x-install-instructions", - "application/x-java-archive-diff", - "application/x-java-jnlp-file", "application/x-latex", "application/x-lua-bytecode", "application/x-lzh-compressed", - "application/x-makeself", - "application/x-mie", - "application/x-mobipocket-ebook", "application/x-ms-application", "application/x-ms-shortcut", - "application/x-ms-wmd", - "application/x-ms-wmz", - "application/x-ms-xbap", - "application/x-msaccess", - "application/x-msbinder", - "application/x-mscardfile", - "application/x-msclip", - "application/x-msmediaview", - "application/x-msmetafile", - "application/x-msmoney", - "application/x-mspublisher", - "application/x-msschedule", - "application/x-msterminal", - "application/x-mswrite", - "application/x-netcdf", - "application/x-ns-proxy-autoconfig", - "application/x-nzb", "application/x-perl", "application/x-pkcs12", "application/x-pkcs7-certificates", "application/x-pkcs7-certreqresp", "application/x-rar-compressed", - "application/x-redhat-package-manager", - "application/x-research-info-systems", - "application/x-sea", "application/x-sh", - "application/x-shar", - "application/x-shockwave-flash", - "application/x-silverlight-app", "application/x-sql", - "application/x-stuffit", - "application/x-stuffitx", "application/x-subrip", - "application/x-sv4cpio", - "application/x-sv4crc", "application/x-t3vm-image", "application/x-tads", "application/x-tar", "application/x-tcl", "application/x-tex", - "application/x-tex-tfm", - "application/x-texinfo", - "application/x-tgif", - "application/x-ustar", - "application/x-wais-source", - "application/x-web-app-manifest+json", "application/x-x509-ca-cert", - "application/x-xfig", - "application/x-xliff+xml", - "application/x-xpinstall", - "application/x-xz", - "application/x-zmachine", - "application/xaml+xml", - "application/xcap-diff+xml", - "application/xenc+xml", "application/xhtml+xml", - "application/xml-dtd", "application/xop+xml", - "application/xproc+xml", "application/xslt+xml", - "application/xspf+xml", - "application/xv+xml", - "application/yang", - "application/yin+xml", "application/zip", "audio/3gpp", "audio/adpcm", @@ -624,17 +127,6 @@ "audio/ogg", "audio/s3m", "audio/silk", - "audio/vnd.dece.audio", - "audio/vnd.digital-winds", - "audio/vnd.dra", - "audio/vnd.dts", - "audio/vnd.dts.hd", - "audio/vnd.lucent.voice", - "audio/vnd.ms-playready.media.pya", - "audio/vnd.nuera.ecelp4800", - "audio/vnd.nuera.ecelp7470", - "audio/vnd.nuera.ecelp9600", - "audio/vnd.rip", "audio/wave", "audio/webm", "audio/x-aac", @@ -642,43 +134,12 @@ "audio/x-caf", "audio/x-flac", "audio/x-matroska", - "audio/x-mpegurl", - "audio/x-ms-wax", - "audio/x-ms-wma", - "audio/x-pn-realaudio", - "audio/x-pn-realaudio-plugin", "audio/xm", - "chemical/x-cdx", - "chemical/x-cif", - "chemical/x-cmdf", - "chemical/x-cml", - "chemical/x-csml", - "chemical/x-xyz", "image/bmp", "image/cgm", - "image/g3fax", - "image/ief", - "image/ktx", - "image/prs.btif", "image/sgi", "image/svg+xml", "image/tiff", - "image/vnd.adobe.photoshop", - "image/vnd.dece.graphic", - "image/vnd.djvu", - "text/vnd.dvb.subtitle", - "image/vnd.dwg", - "image/vnd.dxf", - "image/vnd.fastbidsheet", - "image/vnd.fpx", - "image/vnd.fst", - "image/vnd.fujixerox.edmics-mmr", - "image/vnd.fujixerox.edmics-rlc", - "image/vnd.ms-modi", - "image/vnd.ms-photo", - "image/vnd.net-fpx", - "image/vnd.wap.wbmp", - "image/vnd.xiff", "image/webp", "image/x-3ds", "image/x-cmu-raster", @@ -689,17 +150,9 @@ "image/x-mrsid-image", "image/x-pcx", "image/x-pict", - "image/x-portable-anymap", - "image/x-portable-bitmap", - "image/x-portable-graymap", - "image/x-portable-pixmap", "image/x-rgb", "image/x-tga", - "image/x-xbitmap", - "image/x-xpixmap", - "image/x-xwindowdump", "message/rfc822", - "model/iges", "model/mesh", "model/vnd.collada+xml", "model/vnd.dwf", @@ -707,10 +160,6 @@ "model/vnd.gtw", "model/vnd.mts", "model/vnd.vtu", - "model/vrml", - "model/x3d+binary", - "model/x3d+vrml", - "model/x3d+xml", "text/cache-manifest", "text/calendar", "text/coffeescript", @@ -722,7 +171,6 @@ "text/less", "text/mathml", "text/n3", - "text/prs.lines.tag", "text/richtext", "text/sgml", "text/slim", @@ -737,13 +185,6 @@ "text/vnd.curl.mcurl", "text/vnd.curl.scurl", "text/vnd.fly", - "text/vnd.fmi.flexstor", - "text/vnd.graphviz", - "text/vnd.in3d.3dml", - "text/vnd.in3d.spot", - "text/vnd.sun.j2me.app-descriptor", - "text/vnd.wap.wml", - "text/vnd.wap.wmlscript", "text/vtt", "text/x-asm", "text/x-c", @@ -760,9 +201,6 @@ "text/x-sass", "text/x-scss", "text/x-setext", - "text/x-sfv", - "text/x-suse-ymp", - "text/x-uuencode", "text/x-vcalendar", "text/x-vcard", "text/yaml", @@ -779,13 +217,6 @@ "video/mpeg", "video/ogg", "video/quicktime", - "video/vnd.dece.hd", - "video/vnd.dece.mobile", - "video/vnd.dece.pd", - "video/vnd.dece.sd", - "video/vnd.dece.video", - "video/vnd.dvb.file", - "video/vnd.fvt", "video/vnd.mpegurl", "video/vnd.ms-playready.media.pyv", "video/vnd.uvvu.mp4", diff --git a/app/sync/crypt.js b/app/sync/crypt.js index c9a9bb7cd..8821afd16 100644 --- a/app/sync/crypt.js +++ b/app/sync/crypt.js @@ -208,12 +208,13 @@ export async function generateKeyPairJWK () { if (subtle) { // console.log('-- Using Native RSA Generation --'); - const pair = await subtle.generateKey({ - name: 'RSA-OAEP', - publicExponent: new Uint8Array([1, 0, 1]), - modulusLength: 2048, - hash: 'SHA-256' - }, + const pair = await subtle.generateKey( + { + name: 'RSA-OAEP', + publicExponent: new Uint8Array([1, 0, 1]), + modulusLength: 2048, + hash: 'SHA-256' + }, true, ['encrypt', 'decrypt'] ); @@ -313,7 +314,7 @@ async function _pbkdf2Passphrase (passphrase, salt) { 'raw', Buffer.from(passphrase, 'utf8'), {name: 'PBKDF2'}, - true, + false, ['deriveBits'] ); diff --git a/app/ui/components/codemirror/code-editor.js b/app/ui/components/codemirror/code-editor.js index 6cdea5beb..6263a4f75 100644 --- a/app/ui/components/codemirror/code-editor.js +++ b/app/ui/components/codemirror/code-editor.js @@ -69,7 +69,6 @@ class CodeEditor extends PureComponent { shouldComponentUpdate (nextProps) { // Update if any properties changed, except value. We ignore value. - for (const key of Object.keys(nextProps)) { if (key === 'defaultValue') { continue; diff --git a/app/ui/components/codemirror/extensions/environments-autocomplete.js b/app/ui/components/codemirror/extensions/environments-autocomplete.js index f2eef87ae..0d25104c4 100644 --- a/app/ui/components/codemirror/extensions/environments-autocomplete.js +++ b/app/ui/components/codemirror/extensions/environments-autocomplete.js @@ -7,6 +7,7 @@ const AFTER_TAG_MATCH = /{%\s*[\w.\][]*$/; const COMPLETE_AFTER_VARIABLE_NAME = /[\w.\][]+/; const COMPLETE_AFTER_CURLIES = /[^{]*\{[{%]\s*/; const COMPLETION_CLOSE_KEYS = /[}|]/; +const ESCAPE_FORE_REGEX_MATCH = /[-[\]/{}()*+?.\\^$|]/g; const MAX_HINT_LOOK_BACK = 100; const HINT_DELAY_MILLIS = 100; const TYPE_VARIABLE = 'variable'; @@ -120,7 +121,9 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => { } // In a timeout so it gives the editor chance to update first - setTimeout(() => completeIfInVariableName(cm), HINT_DELAY_MILLIS); + setTimeout(() => { + completeIfInVariableName(cm); + }, HINT_DELAY_MILLIS); }); // Add hot key triggers @@ -252,22 +255,20 @@ function matchStrings (listOfThings, segment, type, limit = -1) { .map(t => typeof t === 'string' ? {name: t, value: ''} : t) // Convert to obj .filter(t => t.name.toLowerCase().includes(segment.toLowerCase())) // Filter .slice(0, limit >= 0 ? limit : listOfThings.length) // Cap it - .map(({name, value}) => { - return { - // Custom Insomnia keys - type, - segment, - comment: value, - displayValue: value ? JSON.stringify(value) : '', - score: name.length, // In case we want to sort by this + .map(({name, value}) => ({ + // Custom Insomnia keys + type, + segment, + comment: value, + displayValue: value ? JSON.stringify(value) : '', + score: name.length, // In case we want to sort by this - // CodeMirror - text: name, - displayText: name, - render: renderHintMatch, - hint: replaceHintMatch - }; - }); + // CodeMirror + text: name, + displayText: name, + render: renderHintMatch, + hint: replaceHintMatch + })); } /** @@ -279,7 +280,7 @@ function matchStrings (listOfThings, segment, type, limit = -1) { * @returns string */ function replaceWithSurround (text, find, prefix, suffix) { - const escapedString = find.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'); + const escapedString = find.replace(ESCAPE_FORE_REGEX_MATCH, '\\$&'); const re = new RegExp(escapedString, 'gi'); return text.replace(re, matched => prefix + matched + suffix); } diff --git a/app/ui/components/editors/body/body-editor.js b/app/ui/components/editors/body/body-editor.js index 78d834953..7a24103ab 100644 --- a/app/ui/components/editors/body/body-editor.js +++ b/app/ui/components/editors/body/body-editor.js @@ -82,7 +82,7 @@ class BodyEditor extends PureComponent { const contentType = getContentTypeFromHeaders(request.headers) || mimeType; return ( + {getAppName()} Preferences diff --git a/app/ui/components/modals/setup-sync-modal.js b/app/ui/components/modals/setup-sync-modal.js index b9f55df7f..8dc69fb8d 100644 --- a/app/ui/components/modals/setup-sync-modal.js +++ b/app/ui/components/modals/setup-sync-modal.js @@ -12,7 +12,8 @@ class SetupSyncModal extends PureComponent { constructor (props) { super(props); this.state = { - syncMode: SYNC_MODE_ON + syncMode: SYNC_MODE_UNSET, + selectedSyncMode: SYNC_MODE_ON }; } @@ -22,18 +23,18 @@ class SetupSyncModal extends PureComponent { async _handleDone () { const {workspace} = this.props; - const {syncMode} = this.state; + const {selectedSyncMode} = this.state; const resource = await sync.getOrCreateResourceForDoc(workspace); - await sync.createOrUpdateConfig(resource.resourceGroupId, syncMode); + await sync.createOrUpdateConfig(resource.resourceGroupId, selectedSyncMode); this.hide(); - this._resolvePromise && this._resolvePromise(syncMode); + this._resolvePromise && this._resolvePromise(selectedSyncMode); } _handleSyncModeChange (e) { - this.setState({syncMode: e.target.value}); + this.setState({selectedSyncMode: e.target.value}); } show () { @@ -42,9 +43,15 @@ class SetupSyncModal extends PureComponent { const resource = await sync.getOrCreateResourceForDoc(workspace); const config = await sync.getOrCreateConfig(resource.resourceGroupId); + const {syncMode} = config; - console.log('CONFIG', config); - this.setState({syncMode: config.syncMode}); + // Set selected sync mode. If it's unset, default it to ON + const selectedSyncMode = syncMode !== SYNC_MODE_UNSET ? syncMode : SYNC_MODE_ON; + + this.setState({ + syncMode, + selectedSyncMode + }); })(); this.modal.show(); @@ -52,6 +59,7 @@ class SetupSyncModal extends PureComponent { this._promise = new Promise(resolve => { this._resolvePromise = resolve; }); + return this._promise; } @@ -61,23 +69,21 @@ class SetupSyncModal extends PureComponent { render () { const {workspace} = this.props; - const {syncMode} = this.state; + const {syncMode, selectedSyncMode} = this.state; return ( Workspace Sync Setup - {syncMode === SYNC_MODE_UNSET ?

You have not yet configured sync for your {workspace.name} workspace.

: null } -