diff --git a/index.js b/index.js index 36ea844..13af0b0 100644 --- a/index.js +++ b/index.js @@ -187,7 +187,11 @@ app.listen(process.env.PORT, () => { }) function initDB(db, channelDB) { - dbMigration.initDB(db, channelDB); + if (!fs.existsSync(process.env.DATABASE + '/images/dizquetv.png')) { + let data = fs.readFileSync(path.resolve(path.join(__dirname, 'resources/dizquetv.png'))) + fs.writeFileSync(process.env.DATABASE + '/images/dizquetv.png', data) + } + dbMigration.initDB(db, channelDB, __dirname); if (!fs.existsSync(process.env.DATABASE + '/font.ttf')) { let data = fs.readFileSync(path.resolve(path.join(__dirname, 'resources/font.ttf'))) fs.writeFileSync(process.env.DATABASE + '/font.ttf', data) diff --git a/resources/dizquetv.png b/resources/dizquetv.png index bac3553..f3c0eec 100644 Binary files a/resources/dizquetv.png and b/resources/dizquetv.png differ diff --git a/resources/favicon.svg b/resources/favicon.svg index 679b6ea..8de1542 100644 --- a/resources/favicon.svg +++ b/resources/favicon.svg @@ -29,7 +29,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.0547013" - inkscape:cx="173.01248" + inkscape:cx="55.816079" inkscape:cy="84.726326" inkscape:document-units="mm" inkscape:current-layer="layer1" @@ -48,7 +48,7 @@ image/svg+xml - + @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-244.08278)"> + style="opacity:1;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> addFPS(db) ], [ 601, 700, (db) => migrateWatermark(db) ], [ 700, 701, (db) => addScalingAlgorithm(db) ], + [ 701, 703, (db,channels,dir) => reAddIcon(dir) ], ] const { v4: uuidv4 } = require('uuid'); @@ -332,7 +333,7 @@ function commercialsRemover(db) { } -function initDB(db, channelDB ) { +function initDB(db, channelDB, dir ) { if (typeof(channelDB) === 'undefined') { throw Error("???"); } @@ -347,7 +348,7 @@ function initDB(db, channelDB ) { ran = true; console.log("Migrating from db version " + dbVersion.version + " to: " + STEPS[i][1] + "..."); try { - STEPS[i][2](db, channelDB); + STEPS[i][2](db, channelDB, dir); if (typeof(dbVersion._id) === 'undefined') { db['db-version'].save( {'version': STEPS[i][1] } ); } else { @@ -755,6 +756,40 @@ function addScalingAlgorithm(db) { fs.writeFileSync( f, JSON.stringify( [ffmpegSettings] ) ); } +function moveBackup(path) { + if (fs.existsSync(`${process.env.DATABASE}${path}`) ) { + let i = 0; + while (fs.existsSync( `${process.env.DATABASE}${path}.bak.${i}`) ) { + i++; + } + fs.renameSync(`${process.env.DATABASE}${path}`, `${process.env.DATABASE}${path}.bak.${i}` ); + } +} + +function reAddIcon(dir) { + moveBackup('/images/dizquetv.png'); + let data = fs.readFileSync(path.resolve(path.join(dir, 'resources/dizquetv.png'))); + fs.writeFileSync(process.env.DATABASE + '/images/dizquetv.png', data); + + if (fs.existsSync(`${process.env.DATABASE}/images/pseudotv.png`) ) { + moveBackup('/images/pseudotv.png'); + let data = fs.readFileSync(path.resolve(path.join(dir, 'resources/dizquetv.png'))); + fs.writeFileSync(process.env.DATABASE + '/images/pseudotv.png', data); + } + + moveBackup('/images/generic-error-screen.png'); + data = fs.readFileSync(path.resolve(path.join(dir, 'resources/generic-error-screen.png'))) + fs.writeFileSync(process.env.DATABASE + '/images/generic-error-screen.png', data) + + moveBackup('/images/generic-offline-screen.png'); + data = fs.readFileSync(path.resolve(path.join(dir, 'resources/generic-offline-screen.png'))); + fs.writeFileSync(process.env.DATABASE + '/images/generic-offline-screen.png', data); + + moveBackup('/images/loading-screen.png'); + data = fs.readFileSync(path.resolve(path.join(dir, 'resources/loading-screen.png'))) + fs.writeFileSync(process.env.DATABASE + '/images/loading-screen.png', data) +} + module.exports = { initDB: initDB, diff --git a/src/svg/dizquetv.svg b/src/svg/dizquetv.svg index 4224dbe..074a661 100644 --- a/src/svg/dizquetv.svg +++ b/src/svg/dizquetv.svg @@ -16,9 +16,9 @@ id="svg8" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="dizquetv.svg" - inkscape:export-filename="/home/vx/dev/dizqueanimation/01.png" - inkscape:export-xdpi="245.75999" - inkscape:export-ydpi="245.75999"> + inkscape:export-filename="/home/vx/dev/pseudotv/resources/dizquetv.png" + inkscape:export-xdpi="240" + inkscape:export-ydpi="240"> image/svg+xml - + @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-244.08278)"> + style="opacity:1;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />