CalvinBackup/anonymous_github
1
0
Fork 0
mirror of https://github.com/tdurieux/anonymous_github.git synced 2026-02-13 10:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: repository refresh will check if new a new commit is available

Browse Source
This commit is contained in:
tdurieux
2021-09-08 15:19:38 +02:00
parent 9838891567
commit 1ae94081d6
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Repository.ts
View File

@@ -141,32 +141,13 @@ export default class Repository {
*
* @returns void
*/
async updateIfNeeded(): Promise<void> {
if (
this.status == "expired" ||
this.status == "expiring" ||
this.status == "removing" ||
this.status == "removed"
) {
throw new AnonymousError("repository_expired", this);
}
const fiveMinuteAgo = new Date();
fiveMinuteAgo.setMinutes(fiveMinuteAgo.getMinutes() - 5);
if (this.status != "ready") {
if (
this._model.statusDate < fiveMinuteAgo &&
this.status != "preparing"
) {
await this.updateStatus("preparing");
await downloadQueue.add(this, { jobId: this.repoId });
}
throw new AnonymousError("repository_not_ready", this);
}
async updateIfNeeded(opt?: { force: boolean }): Promise<void> {
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
if (this._model.options.update && this._model.lastView < yesterday) {
if (
opt?.force ||
(this._model.options.update && this._model.lastView < yesterday)
) {
// Only GitHubBase can be update for the moment
if (this.source instanceof GitHubBase) {
const branches = await this.source.githubRepository.branches({
@@ -187,6 +168,8 @@ export default class Repository {
console.error(
`${branch.name} for ${this.source.githubRepository.fullName} is not found`
);
await this.updateStatus("error", "branch_not_found");
await this.resetSate();
throw new AnonymousError("branch_not_found", this);
}
this._model.anonymizeDate = new Date();

9
src/routes/repository-private.ts
View File

@@ -72,8 +72,7 @@ router.post(
if (repo.owner.id != user.id) {
return res.status(401).json({ error: "not_authorized" });
}
await repo.updateStatus("preparing");
await downloadQueue.add(repo, {jobId: repo.repoId});
await repo.updateIfNeeded({ force: true });
res.json({ status: repo.status });
} catch (error) {
handleError(error, res);
@@ -95,7 +94,7 @@ router.delete(
return res.status(401).json({ error: "not_authorized" });
}
await repo.updateStatus("removing");
await removeQueue.add(repo, {jobId: repo.repoId});
await removeQueue.add(repo, { jobId: repo.repoId });
return res.json({ status: repo.status });
} catch (error) {
handleError(error, res);
@@ -312,7 +311,7 @@ router.post(
repo.model.conference = repoUpdate.conference;
await repo.updateStatus("preparing");
res.json({ status: repo.status });
await downloadQueue.add(repo, {jobId: repo.repoId});
await downloadQueue.add(repo, { jobId: repo.repoId });
} catch (error) {
return handleError(error, res);
}
@@ -376,7 +375,7 @@ router.post("/", async (req: express.Request, res: express.Response) => {
}
res.send({ status: repo.status });
downloadQueue.add(new Repository(repo), {jobId: repo.repoId});
downloadQueue.add(new Repository(repo), { jobId: repo.repoId });
} catch (error) {
if (error.message?.indexOf(" duplicate key") > -1) {
return handleError(

24
src/routes/repository-public.ts
View File

@@ -4,6 +4,8 @@ import * as stream from "stream";
import config from "../../config";
import { getRepo, handleError } from "./route-utils";
import AnonymousError from "../AnonymousError";
import { downloadQueue } from "../queue";
const router = express.Router();
@@ -59,6 +61,28 @@ router.get(
) {
redirectURL = repo.source.url;
} else {
if (
repo.status == "expired" ||
repo.status == "expiring" ||
repo.status == "removing" ||
repo.status == "removed"
) {
throw new AnonymousError("repository_expired", this);
}
const fiveMinuteAgo = new Date();
fiveMinuteAgo.setMinutes(fiveMinuteAgo.getMinutes() - 5);
if (repo.status != "ready") {
if (
repo.model.statusDate < fiveMinuteAgo &&
repo.status != "preparing"
) {
await repo.updateStatus("preparing");
await downloadQueue.add(this, { jobId: repo.repoId });
}
throw new AnonymousError("repository_not_ready", this);
}
await repo.updateIfNeeded();
}