shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use new commit tag file for app version as well

Browse Source
This commit is contained in:
sct
2020-12-27 17:22:21 +00:00
parent 55f9e41f1b
commit d00e470b55
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/routes/index.ts
View File

@@ -1,5 +1,4 @@
import { Router } from 'express'; import { Router } from 'express';
import path from 'path';
import user from './user'; import user from './user';
import authRoutes from './auth'; import authRoutes from './auth';
import { checkUser, isAuthenticated } from '../middleware/auth'; import { checkUser, isAuthenticated } from '../middleware/auth';
@@ -14,18 +13,7 @@ import tvRoutes from './tv';
import mediaRoutes from './media'; import mediaRoutes from './media';
import personRoutes from './person'; import personRoutes from './person';
import collectionRoutes from './collection'; import collectionRoutes from './collection';
import { getAppVersion } from '../utils/appVersion'; import { getAppVersion, getCommitTag } from '../utils/appVersion';
import { existsSync } from 'fs';
import logger from '../logger';
const COMMIT_TAG_PATH = path.join(__dirname, '../../committag.json');
let commitTag = 'local';
if (existsSync(COMMIT_TAG_PATH)) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
commitTag = require(COMMIT_TAG_PATH).commitTag;
logger.info(`Commit Tag: ${commitTag}`);
}
const router = Router(); const router = Router();
@@ -34,7 +22,7 @@ router.use(checkUser);
router.get('/status', (req, res) => { router.get('/status', (req, res) => {
return res.status(200).json({ return res.status(200).json({
version: getAppVersion(), version: getAppVersion(),
commitTag, commitTag: getCommitTag(),
}); });
}); });

19
server/utils/appVersion.ts
View File

@@ -1,3 +1,20 @@
import { existsSync } from 'fs';
import path from 'path';
import logger from '../logger';
const COMMIT_TAG_PATH = path.join(__dirname, '../../committag.json');
let commitTag = 'local';
if (existsSync(COMMIT_TAG_PATH)) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
commitTag = require(COMMIT_TAG_PATH).commitTag;
logger.info(`Commit Tag: ${commitTag}`);
}
export const getCommitTag = (): string => {
return commitTag;
};
export const getAppVersion = (): string => { export const getAppVersion = (): string => {
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const { version } = require('../../package.json'); const { version } = require('../../package.json');
@@ -5,7 +22,7 @@ export const getAppVersion = (): string => {
let finalVersion = version; let finalVersion = version;
if (version === '0.1.0') { if (version === '0.1.0') {
finalVersion = `develop-${process.env.COMMIT_TAG ?? 'local'}`; finalVersion = `develop-${getCommitTag()}`;
} }
return finalVersion; return finalVersion;