mirror of
https://github.com/stonith404/pingvin-share.git
synced 2024-10-02 09:30:10 +02:00
feat: put db and uploads in same folder
This commit is contained in:
parent
759db40ac9
commit
80cdcda93c
2
.gitignore
vendored
2
.gitignore
vendored
@ -35,6 +35,6 @@ yarn-error.log*
|
|||||||
/frontend/public/sw.*
|
/frontend/public/sw.*
|
||||||
|
|
||||||
# project specific
|
# project specific
|
||||||
/backend/uploads/
|
/backend/data/
|
||||||
/data/
|
/data/
|
||||||
/backend/prisma/pingvin-share.db*
|
/backend/prisma/pingvin-share.db*
|
||||||
|
@ -13,10 +13,6 @@ COPY ./backend .
|
|||||||
RUN npx prisma generate
|
RUN npx prisma generate
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FROM node:18 AS runner
|
FROM node:18 AS runner
|
||||||
WORKDIR /opt/app/frontend
|
WORKDIR /opt/app/frontend
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
@ -4,7 +4,7 @@ generator client {
|
|||||||
|
|
||||||
datasource db {
|
datasource db {
|
||||||
provider = "sqlite"
|
provider = "sqlite"
|
||||||
url = "file:./pingvin-share.db"
|
url = "file:../data/pingvin-share.db"
|
||||||
}
|
}
|
||||||
|
|
||||||
model User {
|
model User {
|
||||||
|
@ -27,7 +27,7 @@ export class FileController {
|
|||||||
@UseGuards(JwtGuard, ShareOwnerGuard)
|
@UseGuards(JwtGuard, ShareOwnerGuard)
|
||||||
@UseInterceptors(
|
@UseInterceptors(
|
||||||
FileInterceptor("file", {
|
FileInterceptor("file", {
|
||||||
dest: "./uploads/_temp/",
|
dest: "./data/uploads/_temp/",
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
async create(
|
async create(
|
||||||
|
@ -8,7 +8,6 @@ import { JwtService } from "@nestjs/jwt";
|
|||||||
import { randomUUID } from "crypto";
|
import { randomUUID } from "crypto";
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import * as mime from "mime-types";
|
import * as mime from "mime-types";
|
||||||
import { join } from "path";
|
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -29,10 +28,12 @@ export class FileService {
|
|||||||
|
|
||||||
const fileId = randomUUID();
|
const fileId = randomUUID();
|
||||||
|
|
||||||
await fs.promises.mkdir(`./uploads/shares/${shareId}`, { recursive: true });
|
await fs.promises.mkdir(`./data/uploads/shares/${shareId}`, {
|
||||||
|
recursive: true,
|
||||||
|
});
|
||||||
fs.promises.rename(
|
fs.promises.rename(
|
||||||
`./uploads/_temp/${file.filename}`,
|
`./data/uploads/_temp/${file.filename}`,
|
||||||
`./uploads/shares/${shareId}/${fileId}`
|
`./data/uploads/shares/${shareId}/${fileId}`
|
||||||
);
|
);
|
||||||
|
|
||||||
return await this.prisma.file.create({
|
return await this.prisma.file.create({
|
||||||
@ -53,7 +54,7 @@ export class FileService {
|
|||||||
if (!fileMetaData) throw new NotFoundException("File not found");
|
if (!fileMetaData) throw new NotFoundException("File not found");
|
||||||
|
|
||||||
const file = fs.createReadStream(
|
const file = fs.createReadStream(
|
||||||
join(process.cwd(), `uploads/shares/${shareId}/${fileId}`)
|
`./data/uploads/shares/${shareId}/${fileId}`
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -67,14 +68,14 @@ export class FileService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async deleteAllFiles(shareId: string) {
|
async deleteAllFiles(shareId: string) {
|
||||||
await fs.promises.rm(`./uploads/shares/${shareId}`, {
|
await fs.promises.rm(`./data/uploads/shares/${shareId}`, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
force: true,
|
force: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getZip(shareId: string) {
|
getZip(shareId: string) {
|
||||||
return fs.createReadStream(`./uploads/shares/${shareId}/archive.zip`);
|
return fs.createReadStream(`./data/uploads/shares/${shareId}/archive.zip`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getFileDownloadUrl(shareId: string, fileId: string) {
|
getFileDownloadUrl(shareId: string, fileId: string) {
|
||||||
|
@ -7,7 +7,7 @@ async function bootstrap() {
|
|||||||
app.useGlobalPipes(new ValidationPipe());
|
app.useGlobalPipes(new ValidationPipe());
|
||||||
app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));
|
app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));
|
||||||
|
|
||||||
await fs.promises.mkdir("./uploads/_temp", { recursive: true });
|
await fs.promises.mkdir("./data/uploads/_temp", { recursive: true });
|
||||||
|
|
||||||
app.setGlobalPrefix("api");
|
app.setGlobalPrefix("api");
|
||||||
await app.listen(8080);
|
await app.listen(8080);
|
||||||
|
@ -8,7 +8,7 @@ export class PrismaService extends PrismaClient {
|
|||||||
super({
|
super({
|
||||||
datasources: {
|
datasources: {
|
||||||
db: {
|
db: {
|
||||||
url: "file:./pingvin-share.db",
|
url: "file:../data/pingvin-share.db",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -57,7 +57,7 @@ export class ShareService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async createZip(shareId: string) {
|
async createZip(shareId: string) {
|
||||||
const path = `./uploads/shares/${shareId}`;
|
const path = `./data/uploads/shares/${shareId}`;
|
||||||
|
|
||||||
const files = await this.prisma.file.findMany({ where: { shareId } });
|
const files = await this.prisma.file.findMany({ where: { shareId } });
|
||||||
const archive = archiver("zip", {
|
const archive = archiver("zip", {
|
||||||
|
@ -12,5 +12,4 @@ services:
|
|||||||
- MAX_FILE_SIZE=${MAX_FILE_SIZE}
|
- MAX_FILE_SIZE=${MAX_FILE_SIZE}
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
volumes:
|
volumes:
|
||||||
- "${PWD}/data/uploads:/opt/app/backend/uploads"
|
- "${PWD}/data:/opt/app/backend/data"
|
||||||
- "${PWD}/data/pingvin-share.db:/opt/app/backend/prisma/pingvin-share.db"
|
|
||||||
|
Loading…
Reference in New Issue
Block a user