Merge pull request #1501 from processing/bug/duplicate-sketch-media-files
[#1500] Update sketch media file duplication code
This commit is contained in:
commit
b83824d933
2 changed files with 4 additions and 2 deletions
|
@ -16,6 +16,8 @@ import {
|
|||
import { clearState, saveState } from '../../../persistState';
|
||||
|
||||
const ROOT_URL = getConfig('API_URL');
|
||||
const S3_BUCKET_URL_BASE = getConfig('S3_BUCKET_URL_BASE');
|
||||
const S3_BUCKET = getConfig('S3_BUCKET');
|
||||
|
||||
export function setProject(project) {
|
||||
return {
|
||||
|
@ -287,7 +289,7 @@ export function cloneProject(id) {
|
|||
|
||||
// duplicate all files hosted on S3
|
||||
each(newFiles, (file, callback) => {
|
||||
if (file.url && file.url.includes('amazonaws')) {
|
||||
if (file.url && (file.url.includes(S3_BUCKET_URL_BASE) || file.url.includes(S3_BUCKET))) {
|
||||
const formParams = {
|
||||
url: file.url
|
||||
};
|
||||
|
|
|
@ -28,7 +28,7 @@ function getExtension(filename) {
|
|||
export function getObjectKey(url) {
|
||||
const urlArray = url.split('/');
|
||||
let objectKey;
|
||||
if (urlArray.length === 6) {
|
||||
if (urlArray.length === 5) {
|
||||
const key = urlArray.pop();
|
||||
const userId = urlArray.pop();
|
||||
objectKey = `${userId}/${key}`;
|
||||
|
|
Loading…
Reference in a new issue