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

feat: measure and display user quota (#72)

Browse Source
This commit is contained in:
Thomas Durieux
2021-09-06 14:53:42 +02:00
committed by GitHub
parent 91014fbae2
commit 20e8d533f4
9 changed files with 199 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
migrateDB.ts
View File

@@ -164,18 +164,21 @@ async function connect(db) {
console.error(`Repository ${r.fullName} is not found (renamed)`);
}
}
let size = 0;
let size = { storage: 0, file: 0 };
function recursiveCount(files) {
let total = 0;
const out = { storage: 0, file: 0 };
for (const name in files) {
const file = files[name];
if (file.size && file.sha && parseInt(file.size) == file.size) {
total += file.size as number;
out.storage += file.size as number;
out.file++;
} else if (typeof file == "object") {
total += recursiveCount(file);
const r = recursiveCount(file);
out.storage += r.storage;
out.file += r.file;
}
}
return total;
return out;
}
if (r.originalFiles) {

1
public/i18n/locale-en.json
View File

@@ -9,6 +9,7 @@
"repoId_already_used": "The repository id is already used.",
"invalid_repoId": "The format of the repository id is invalid.",
"branch_not_specified": "The branch is not specified.",
"branch_not_found": "The branch of the repository cannot be found.",
"options_not_provided": "Anonymization options are mandatory.",
"invalid_terms_format": "Terms are in an invalid format.",
"unable_to_anonymize": "An error happened during the anonymization process. Please try later or report the issue.",

63
public/partials/dashboard.htm
View File

@@ -152,6 +152,67 @@
</div>
</div>
</div>
<div class="mt-1 mr-1" style="margin-top: -0.25rem !important">
<strong>Repository</strong>
<div class="progress" style="min-width: 150px">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.repository.percent < 25 || quota.repository.total == 0, 'bg-danger': quota.repository.percent > 95 && quota.repository.total > 0, 'bg-warning': quota.repository.percent > 75 && quota.repository.total > 0 }"
role="progressbar"
style="width: {{quota.repository.percent}}%;"
aria-valuenow="{{quota.repository.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.repository.total}}"
>
<span ng-show="quota"
>{{quota.repository.used |
number}}/{{quota.repository.total}}</span
>
</div>
</div>
</div>
<div class="mt-1 mr-1" style="margin-top: -0.25rem !important">
<strong>Storage</strong>
<div class="progress" style="min-width: 150px">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.storage.percent < 25 || quota.storage.total == 0, 'bg-danger': quota.storage.percent > 95 && quota.storage.total > 0, 'bg-warning': quota.storage.percent > 75 && quota.storage.total > 0 }"
role="progressbar"
style="width: {{quota.storage.percent}}%;"
aria-valuenow="{{quota.storage.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.storage.total}}"
>
<span ng-show="quota"
>{{quota.storage.used |
humanFileSize}}/{{quota.storage.total|
humanFileSize}}</span
>
</div>
</div>
</div>
<div class="mt-1 mr-1" style="margin-top: -0.25rem !important">
<strong>File</strong>
<div class="progress" style="min-width: 150px">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.file.percent < 25 || quota.file.total == 0, 'bg-danger': quota.file.percent > 95 && quota.file.total > 0, 'bg-warning': quota.file.percent > 75 && quota.file.total > 0 }"
role="progressbar"
style="width: {{quota.file.percent}}%;"
aria-valuenow="{{quota.file.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.file.total}}"
>
<span ng-show="quota"
>{{quota.file.used | number}}/{{quota.file.total ||
"∞"}}</span
>
</div>
</div>
</div>
</div>
</div>
</form>
@@ -235,7 +296,7 @@
data-toggle="tooltip"
data-placement="bottom"
>
<i class="fas fa-database"></i> {{::repo.size |
<i class="fas fa-database"></i> {{::repo.size.storage |
humanFileSize}}</span
>
<span

52
public/partials/profile.htm
View File

@@ -1,4 +1,56 @@
<div class="container py-4">
<h2>Quota</h2>
<h3>Quota</h3>
<h5>Repository</h5>
<div class="progress">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.repository.percent < 25 || quota.repository.total == 0, 'bg-danger': quota.repository.percent > 95 && quota.repository.total > 0, 'bg-warning': quota.repository.percent > 75 && quota.repository.total > 0 }"
role="progressbar"
style="width: {{quota.repository.percent}}%;"
aria-valuenow="{{quota.repository.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.repository.total}}"
>
<span ng-show="quota"
>{{quota.repository.used | number}}/{{quota.repository.total}}</span
>
</div>
</div>
<h5>Storage</h5>
<div class="progress">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.storage.percent < 25 || quota.storage.total == 0, 'bg-danger': quota.storage.percent > 95 && quota.storage.total > 0, 'bg-warning': quota.storage.percent > 75 && quota.storage.total > 0 }"
role="progressbar"
style="width: {{quota.storage.percent}}%;"
aria-valuenow="{{quota.storage.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.storage.total}}"
>
<span ng-show="quota"
>{{quota.storage.used | humanFileSize}}/{{quota.storage.total|
humanFileSize}}</span
>
</div>
</div>
<h5>File</h5>
<div class="progress">
<div
class="progress-bar"
ng-class="{'progress-bar-striped progress-bar-animated w-100 bg-dark': !quota, 'bg-success': quota.file.percent < 25 || quota.file.total == 0, 'bg-danger': quota.file.percent > 95 && quota.file.total > 0, 'bg-warning': quota.file.percent > 75 && quota.file.total > 0 }"
role="progressbar"
style="width: {{quota.file.percent}}%;"
aria-valuenow="{{quota.file.used}}"
aria-valuemin="0"
aria-valuemax="{{quota.file.total}}"
>
<span ng-show="quota"
>{{quota.file.used | number}}/{{quota.file.total || "∞"}}</span
>
</div>
</div>
<h2>Default anonymization options</h2>
<form class="form needs-validation" name="default" novalidate>
<!-- Terms -->

24
public/script/app.js
View File

@@ -406,6 +406,7 @@ angular
$http.get("/api/user").then(
(res) => {
if (res) $scope.user = res.data;
getQuota();
},
() => {
$scope.user = null;
@@ -425,6 +426,22 @@ angular
);
}
getOptions();
function getQuota() {
$http.get("/api/user/quota").then((res) => {
$scope.quota = res.data;
$scope.quota.storage.percent = $scope.quota.storage.total
? ($scope.quota.storage.used * 100) / $scope.quota.storage.total
: 100;
$scope.quota.file.percent = $scope.quota.file.total
? ($scope.quota.file.used * 100) / $scope.quota.file.total
: 100;
$scope.quota.repository.percent = $scope.quota.repository.total
? ($scope.quota.repository.used * 100) /
$scope.quota.repository.total
: 100;
}, console.error);
}
getQuota();
function getMessage() {
$http.get("/api/message").then(
@@ -605,13 +622,6 @@ angular
}
getRepositories();
function getQuota() {
$http.get("/api/user/quota").then((res) => {
$scope.quota = res.data;
}, console.error);
}
// getQuota();
$scope.removeRepository = (repo) => {
if (
confirm(

47
src/Repository.ts
View File

@@ -82,7 +82,7 @@ export default class Repository {
}
const files = await this.source.getFiles();
this._model.originalFiles = files;
this._model.size = 0;
this._model.size = { storage: 0, file: 0 };
await this.computeSize();
await this._model.save();
@@ -149,14 +149,21 @@ export default class Repository {
const branch = this.source.branch;
if (
branch.commit ==
branches.filter((f) => f.name == branch.name)[0].commit
branches.filter((f) => f.name == branch.name)[0]?.commit
) {
console.log(`${this._model.repoId} is up to date`);
return;
}
this._model.source.commit = branches.filter(
(f) => f.name == branch.name
)[0].commit;
)[0]?.commit;
if (!this._model.source.commit) {
console.error(
`${branch.name} for ${this.source.githubRepository.fullName} is not found`
);
throw new Error("branch_not_found");
}
this._model.anonymizeDate = new Date();
console.log(
`${this._model.repoId} will be updated to ${this._model.source.commit}`
@@ -218,7 +225,7 @@ export default class Repository {
*/
private async resetSate(status?: RepositoryStatus) {
if (status) this._model.status = status;
this._model.size = 0;
this._model.size = { storage: 0, file: 0 };
this._model.originalFiles = null;
return Promise.all([
this._model.save(),
@@ -227,27 +234,39 @@ export default class Repository {
}
/**
* Compute the size of the repository in bite.
* Compute the size of the repository in term of storage and number of files.
*
* @returns The size of the repository in bite
*/
async computeSize(): Promise<number> {
if (this._model.status != "ready") return 0;
if (this._model.size) return this._model.size;
async computeSize(): Promise<{
/**
* Size of the repository in bit
*/
storage: number;
/**
* The number of files
*/
file: number;
}> {
if (this._model.status != "ready") return { storage: 0, file: 0 };
if (this._model.size.file) return this._model.size;
function recursiveCount(files) {
let total = 0;
const out = { storage: 0, file: 0 };
for (const name in files) {
const file = files[name];
if (file.size) {
total += file.size as number;
out.storage += file.size as number;
out.file++;
} else if (typeof file == "object") {
total += recursiveCount(file);
const r = recursiveCount(file);
out.storage += r.storage;
out.file += r.file;
}
}
return total;
return out;
}
const files = await this.files({ force: false });
const files = await this.files();
this._model.size = recursiveCount(files);
await this._model.save();
return this._model.size;
@@ -291,7 +310,7 @@ export default class Repository {
}
get size() {
if (this._model.status != "ready") return 0;
if (this._model.status != "ready") return { storage: 0, file: 0 };
return this._model.size;
}

10
src/database/anonymizedRepositories/anonymizedRepositories.schema.ts
View File

@@ -46,8 +46,14 @@ const AnonymizedRepositorySchema = new Schema({
default: new Date(),
},
size: {
type: Number,
default: 0,
storage: {
type: Number,
default: 0,
},
file: {
type: Number,
default: 0,
},
},
});

5
src/database/anonymizedRepositories/anonymizedRepositories.types.ts
View File

@@ -34,7 +34,10 @@ export interface IAnonymizedRepository {
};
pageView: number;
lastView: Date;
size: number;
size: {
storage: number;
file: number;
};
}
export interface IAnonymizedRepositoryDocument

17
src/routes/user.ts
View File

@@ -29,14 +29,25 @@ router.get("/", async (req: express.Request, res: express.Response) => {
router.get("/quota", async (req: express.Request, res: express.Response) => {
try {
const user = await getUser(req);
const repositories = await user.getRepositories();
const sizes = await Promise.all(
(await user.getRepositories())
repositories
.filter((r) => r.status == "ready")
.map((r) => r.computeSize())
);
res.json({
used: sizes.reduce((sum, i) => sum + i, 0),
total: config.DEFAULT_QUOTA,
storage: {
used: sizes.reduce((sum, i) => sum + i.storage, 0),
total: config.DEFAULT_QUOTA,
},
file: {
used: sizes.reduce((sum, i) => sum + i.file, 0),
total: 0,
},
repository: {
used: repositories.length,
total: 20,
},
});
} catch (error) {
handleError(error, res);