yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 09:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13996 from strapi/fix/upload-image-without-extension

Browse Source 
Fix: upload media image with non standard urls
This commit is contained in:
Marc 2022-08-17 09:29:29 +02:00 committed by GitHub
commit 21d06ce7d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js
View File

@ -161,7 +161,7 @@ describe('UploadAssetDialog', () => {
const assets = [
{
name: 'http://localhost:5000/an-image.png',
name: 'an-image.png',
ext: 'png',
mime: 'image/png',
source: 'url',
@ -170,7 +170,7 @@ describe('UploadAssetDialog', () => {
rawFile: new File([''], 'image/png'),
},
{
name: 'http://localhost:5000/a-pdf.pdf',
name: 'a-pdf.pdf',
ext: 'pdf',
mime: 'application/pdf',
source: 'url',
@ -179,7 +179,7 @@ describe('UploadAssetDialog', () => {
rawFile: new File([''], 'application/pdf'),
},
{
name: 'http://localhost:5000/a-video.mp4',
name: 'a-video.mp4',
ext: 'mp4',
mime: 'video/mp4',
source: 'url',
@ -188,7 +188,7 @@ describe('UploadAssetDialog', () => {
rawFile: new File([''], 'video/mp4'),
},
{
name: 'http://localhost:5000/not-working-like-cors.lutin',
name: 'not-working-like-cors.lutin',
ext: 'lutin',
mime: 'application/json',
source: 'url',

6
packages/core/upload/admin/src/utils/urlsToAssets.js
View File

@ -2,6 +2,10 @@ import axios from 'axios';
import { AssetSource } from '../constants';
import { typeFromMime } from './typeFromMime';
function getFilenameFromURL(url) {
return new URL(url).pathname.split('/').pop();
}
export const urlsToAssets = async (urls) => {
const assetPromises = urls.map((url) =>
axios
@ -10,7 +14,7 @@ export const urlsToAssets = async (urls) => {
timeout: 60000,
})
.then((res) => {
const loadedFile = new File([res.data], res.config.url, {
const loadedFile = new File([res.data], getFilenameFromURL(res.config.url), {
type: res.headers['content-type'],
});

6
packages/core/upload/server/services/upload.js
View File

@ -12,6 +12,7 @@ const crypto = require('crypto');
const fs = require('fs');
const fse = require('fs-extra');
const _ = require('lodash');
const { extension } = require('mime-types');
const {
sanitize,
nameToSlug,
@ -72,7 +73,10 @@ module.exports = ({ strapi }) => ({
async formatFileInfo({ filename, type, size }, fileInfo = {}, metas = {}) {
const fileService = getService('file');
const ext = path.extname(filename);
let ext = path.extname(filename);
if (!ext) {
ext = `.${extension(type)}`;
}
const basename = path.basename(fileInfo.name || filename, ext);
const usedName = fileInfo.name || filename;