From b69a0c2a2e42e69877b8921de993662dba2eba73 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sun, 14 Jun 2020 10:42:13 -0400 Subject: [PATCH] Clean up --- packages/skin-database/cli.ts | 10 +--------- packages/skin-database/index.js | 3 --- packages/skin-database/tasks/migrate.ts | 16 ---------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 packages/skin-database/tasks/migrate.ts diff --git a/packages/skin-database/cli.ts b/packages/skin-database/cli.ts index e17fc70d..c96823c8 100755 --- a/packages/skin-database/cli.ts +++ b/packages/skin-database/cli.ts @@ -4,16 +4,12 @@ import fs from "fs"; import { argv } from "yargs"; import fetchInternetArchiveMetadata from "./tasks/fetchInternetArchiveMetadata"; import ensureInternetArchiveItemsIndexByMd5 from "./tasks/ensureInternetArchiveItemsIndexByMd5"; -import migrate from "./tasks/migrate"; import logger from "./logger"; import DiscordWinstonTransport from "./DiscordWinstonTransport"; import * as Skins from "./data/skins"; -import db from "./db"; import Discord from "discord.js"; import { tweet } from "./tasks/tweet"; import { addSkinFromBuffer } from "./addSkin"; -import fetch from "node-fetch"; -import { analyseBuffer, NsfwPrediction } from "./nsfwImage"; async function main() { const client = new Discord.Client(); @@ -35,7 +31,7 @@ async function main() { break; case "metadata": { const hash = argv._[1]; - console.log(await Skins.getInternetArchiveUrl(hash)); + console.log(Skins.getInternetArchiveUrl(hash)); break; } case "skin": { @@ -68,9 +64,6 @@ async function main() { console.log("Done."); break; } - case "migrate": { - await migrate(); - } case "tweet-data": { // From running `tweet.py sort` const file = fs.readFileSync( @@ -98,7 +91,6 @@ async function main() { } finally { logger.close(); client.destroy(); - await db.close(); } } diff --git a/packages/skin-database/index.js b/packages/skin-database/index.js index 321e6364..14df41b6 100644 --- a/packages/skin-database/index.js +++ b/packages/skin-database/index.js @@ -1,9 +1,6 @@ const express = require("express"); const app = express(); const config = require("./config"); -const db = require("./db"); -const iaItems = db.get("internetArchiveItems"); -// const info = require("/Volumes/Mobile Backup/skins/cache/info.json"); const Skins = require("./data/skins"); const port = 3001; const fileUpload = require("express-fileupload"); diff --git a/packages/skin-database/tasks/migrate.ts b/packages/skin-database/tasks/migrate.ts deleted file mode 100644 index 4a0107dd..00000000 --- a/packages/skin-database/tasks/migrate.ts +++ /dev/null @@ -1,16 +0,0 @@ -const db = require("../db"); -const iaItems = db.get("internetArchiveItems"); -const skins = db.get("skins"); - -async function main() { - const item = await iaItems.findOne({ - migrated: { $exists: false }, - md5: { $exists: true }, - }); - - skins.update({ md5: item.md5 }); - - console.log(item); -} - -export default main;