laosb/ghos3
1
0
Fork 0
mirror of https://github.com/laosb/ghos3.git synced 2025-05-01 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

normalize path for win

Browse source
This commit is contained in:
dyadyaJora 2024-02-27 02:02:17 +04:00
parent ac6e5bc277
commit f2970d584a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/index.ts
View file

@ -14,6 +14,9 @@ const stripLeadingSlash = (s: string) =>
s.indexOf('/') === 0 ? s.substring(1) : s s.indexOf('/') === 0 ? s.substring(1) : s
const stripEndingSlash = (s: string) => const stripEndingSlash = (s: string) =>
s.indexOf('/') === s.length - 1 ? s.substring(0, s.length - 1) : s s.indexOf('/') === s.length - 1 ? s.substring(0, s.length - 1) : s
const normalizePath = (filePath) => {
return filePath.replace(/\\/g, '/');
};
type Config = { type Config = {
accessKeyId?: string accessKeyId?: string
@ -86,7 +89,7 @@ class S3Storage extends StorageBase {
defaultHost defaultHost
this.pathPrefix = stripLeadingSlash( this.pathPrefix = stripLeadingSlash(
process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || '' normalizePath(process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || '')
) )
this.endpoint = this.endpoint =
process.env.GHOST_STORAGE_ADAPTER_S3_ENDPOINT || endpoint || '' process.env.GHOST_STORAGE_ADAPTER_S3_ENDPOINT || endpoint || ''
@ -101,7 +104,7 @@ class S3Storage extends StorageBase {
try { try {
await this.s3().deleteObject({ await this.s3().deleteObject({
Bucket: this.bucket, Bucket: this.bucket,
Key: stripLeadingSlash(join(directory, fileName)), Key: stripLeadingSlash(normalizePath(join(directory, fileName))),
}) })
} catch { } catch {
return false return false
@ -114,7 +117,7 @@ class S3Storage extends StorageBase {
await this.s3().getObject({ await this.s3().getObject({
Bucket: this.bucket, Bucket: this.bucket,
Key: stripLeadingSlash( Key: stripLeadingSlash(
targetDir ? join(targetDir, fileName) : fileName normalizePath(targetDir ? join(targetDir, fileName) : fileName)
), ),
}) })
} catch { } catch {
@ -162,7 +165,7 @@ class S3Storage extends StorageBase {
Bucket: this.bucket, Bucket: this.bucket,
CacheControl: `max-age=${30 * 24 * 60 * 60}`, CacheControl: `max-age=${30 * 24 * 60 * 60}`,
ContentType: image.type, ContentType: image.type,
Key: stripLeadingSlash(fileName), Key: stripLeadingSlash(normalizePath(fileName)),
} }
await this.s3().putObject(config) await this.s3().putObject(config)
@ -174,7 +177,7 @@ class S3Storage extends StorageBase {
try { try {
const output = await this.s3().getObject({ const output = await this.s3().getObject({
Bucket: this.bucket, Bucket: this.bucket,
Key: stripLeadingSlash(stripEndingSlash(this.pathPrefix) + req.path), Key: stripLeadingSlash(stripEndingSlash(this.pathPrefix) + normalizePath(req.path)),
}) })
const headers: { [key: string]: string } = {} const headers: { [key: string]: string } = {}
@ -213,7 +216,7 @@ class S3Storage extends StorageBase {
const response = await this.s3().getObject({ const response = await this.s3().getObject({
Bucket: this.bucket, Bucket: this.bucket,
Key: stripLeadingSlash(path), Key: stripLeadingSlash(normalizePath(path)),
}) })
const stream = response.Body as Readable const stream = response.Body as Readable