Skip to content

Commit

Permalink
Updated from timvisee/send master
Browse files Browse the repository at this point in the history
  • Loading branch information
simepy committed Feb 3, 2023
2 parents c524804 + 65730db commit 9177383
Show file tree
Hide file tree
Showing 4 changed files with 3,237 additions and 2,369 deletions.
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ stages:
# Build Send, run npm tests
test:
stage: test
image: "node:15-slim"
image: "node:16-slim"
only:
- api
- branches
Expand All @@ -27,6 +27,7 @@ test:
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
- sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
- apt-get update
- apt-get install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils
- apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
script:
- npm ci
Expand Down
3 changes: 2 additions & 1 deletion app/archive.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default class Archive {
constructor(files = [], defaultTimeLimit = 86400, defaultDownloadLimit = 1) {
this.files = Array.from(files);
this.defaultTimeLimit = defaultTimeLimit;
this.defaultDownloadLimit = defaultDownloadLimit;
this.timeLimit = defaultTimeLimit;
this.dlimit = defaultDownloadLimit;
this.password = null;
Expand Down Expand Up @@ -76,7 +77,7 @@ export default class Archive {

clear() {
this.files = [];
this.dlimit = 1;
this.dlimit = this.defaultDownloadLimit;
this.timeLimit = this.defaultTimeLimit;
this.password = null;
}
Expand Down
Loading

0 comments on commit 9177383

Please sign in to comment.