Version and commit info is now generated during autobuilds and can be viewed in the about dialog

Prepared removal of JSON translations from repo to move towards XLIFF-only

.github/workflows/build.yml

@@ -25,6 +25,23 @@ jobs:
           cd backend
           npm install
           sudo npm install -g @angular/cli
+      - name: prepare localization
+        run: |
+          sudo npm install -g xliff-to-json
+          xliff-to-json ./src/assets/i18n
+      - name: Set hash
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: create-json
+        id: create-json
+        uses: jsdaniell/create-json@1.1.2
+        with:
+          name: "version.json"
+          json: '{"type": "autobuild", "tag": "N/A", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
+          dir: 'backend/'
       - name: build
         run: ng build --prod
       - name: prepare artifact upload

.github/workflows/docker-release.yml

@@ -13,6 +13,23 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
+      - name: prepare localization
+        run: |
+          sudo npm install -g xliff-to-json
+          xliff-to-json ./src/assets/i18n
+      - name: Set hash
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: create-json
+        id: create-json
+        uses: jsdaniell/create-json@1.1.2
+        with:
+          name: "version.json"
+          json: '{"type": "docker", "tag": "latest", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
+          dir: 'backend/'
       - name: setup platform emulator
         uses: docker/setup-qemu-action@v1
       - name: setup multi-arch docker build

.github/workflows/docker.yml

@@ -10,6 +10,23 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
+      - name: prepare localization
+        run: |
+          sudo npm install -g xliff-to-json
+          xliff-to-json ./src/assets/i18n
+      - name: Set hash
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: create-json
+        id: create-json
+        uses: jsdaniell/create-json@1.1.2
+        with:
+          name: "version.json"
+          json: '{"type": "docker", "tag": "nightly", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
+          dir: 'backend/'
       - name: setup platform emulator
         uses: docker/setup-qemu-action@v1
       - name: setup multi-arch docker build

backend/app.js

@@ -142,6 +142,14 @@ var validDownloadingAgents = [
 
 const subscription_timeouts = {};
 
+let version_info = null;
+if (fs.existsSync('version.json')) {
+    version_info = fs.readJSONSync('version.json');
+    logger.verbose(`Version info: ${JSON.stringify(version_info, null, 2)}`);
+} else {
+    version_info = {'type': 'N/A', 'tag': 'N/A', 'commit': 'N/A', 'date': 'N/A'};
+}
+
 // don't overwrite config if it already happened.. NOT
 // let alreadyWritten = db.get('configWriteFlag').value();
 let writeConfigMode = process.env.write_ytdl_config;
@@ -932,6 +940,10 @@ app.post('/api/setConfig', optionalJwt, function(req, res) {
     }
 });
 
+app.get('/api/versionInfo', (req, res) => {
+    res.send({version_info: version_info});
+});
+
 app.post('/api/restartServer', optionalJwt, (req, res) => {
     // delayed by a little bit so that the client gets a response
     setTimeout(() => {restartServer()}, 100);

src/app/app.component.ts

@@ -118,6 +118,10 @@ export class AppComponent implements OnInit, AfterViewInit {
     }
 
     this.postsService.reloadCategories();
+
+    this.postsService.getVersionInfo().subscribe(res => {
+      this.postsService.version_info = res['version_info'];
+    });
   }
 
   // theme stuff

src/app/dialogs/about-dialog/about-dialog.component.html

@@ -21,6 +21,17 @@
             <mat-icon *ngIf="!checking_for_updates" class="version-checked-icon">done</mat-icon>&nbsp;&nbsp;<ng-container *ngIf="!checking_for_updates && latestGithubRelease['tag_name'] !== current_version_tag"><a [href]="latestUpdateLink" target="_blank"><ng-container i18n="View latest update">Update available</ng-container> - {{latestGithubRelease['tag_name']}}</a>. <ng-container i18n="Update through settings menu hint">You can update from the settings menu.</ng-container></ng-container>
             <span *ngIf="!checking_for_updates && latestGithubRelease['tag_name'] === current_version_tag">You are up to date.</span>
         </p>
+        <p>
+            <ng-container i18n="Installation type">Installation type:</ng-container>&nbsp;{{postsService.version_info.type}}
+            <br>
+            <ng-container *ngIf="postsService.version_info.type === 'docker'">
+                <ng-container i18n="Docker tag">Docker tag:</ng-container>&nbsp;{{postsService.version_info.tag}}
+                <br>
+            </ng-container>
+            <ng-container i18n="Commit hash">Commit hash:</ng-container>&nbsp;{{postsService.version_info.commit}}
+            <br>
+            <ng-container i18n="Build date">Build date:</ng-container>&nbsp;{{postsService.version_info.date}}
+        </p>
         <p>
             <ng-container i18n="About bug prefix">Found a bug or have a suggestion?</ng-container>&nbsp;<a [href]="issuesLink" target="_blank"><ng-container i18n="About bug click here">Click here</ng-container></a>&nbsp;<ng-container i18n="About bug suffix">to create an issue!</ng-container>
         </p>

src/app/dialogs/about-dialog/about-dialog.component.ts

@@ -19,7 +19,7 @@ export class AboutDialogComponent implements OnInit {
   sidepanel_mode = this.postsService.sidepanel_mode;
   card_size = this.postsService.card_size;
 
-  constructor(private postsService: PostsService) { }
+  constructor(public postsService: PostsService) { }
 
   ngOnInit(): void {
     this.getLatestGithubRelease();

src/app/posts.services.ts

@@ -60,6 +60,7 @@ export class PostsService implements CanActivate {
     categories = null;
     sidenav = null;
     locale = isoLangs['en'];
+    version_info = null;
 
     constructor(private http: HttpClient, private router: Router, @Inject(DOCUMENT) private document: Document,
                 public snackBar: MatSnackBar, private titleService: Title) {
@@ -453,6 +454,10 @@ export class PostsService implements CanActivate {
         return this.http.post(this.path + 'clearFinishedDownloads', {}, this.httpOptions);
     }
 
+    getVersionInfo() {
+        return this.http.get(this.path + 'versionInfo', this.httpOptions);
+    }
+
     updateServer(tag) {
         return this.http.post(this.path + 'updateServer', {tag: tag}, this.httpOptions);
     }