From d805da906a1744c23e0b484b522b078102675770 Mon Sep 17 00:00:00 2001 From: Max Isom Date: Thu, 18 Nov 2021 20:50:44 -0500 Subject: Rename existing cache model --- src/models/cache.ts | 15 --------------- src/models/index.ts | 4 ++-- src/models/key-value-cache.ts | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 src/models/cache.ts create mode 100644 src/models/key-value-cache.ts (limited to 'src/models') diff --git a/src/models/cache.ts b/src/models/cache.ts deleted file mode 100644 index ebf8dad..0000000 --- a/src/models/cache.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Table, Column, PrimaryKey, Model} from 'sequelize-typescript'; -import sequelize from 'sequelize'; - -@Table -export default class Cache extends Model { - @PrimaryKey - @Column - key!: string; - - @Column(sequelize.TEXT) - value!: string; - - @Column - expiresAt!: Date; -} diff --git a/src/models/index.ts b/src/models/index.ts index fec0c8e..d39a3dc 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -1,9 +1,9 @@ -import Cache from './cache.js'; +import KeyValueCache from './key-value-cache.js'; import Settings from './settings.js'; import Shortcut from './shortcut.js'; export { - Cache, + KeyValueCache, Settings, Shortcut, }; diff --git a/src/models/key-value-cache.ts b/src/models/key-value-cache.ts new file mode 100644 index 0000000..795ff75 --- /dev/null +++ b/src/models/key-value-cache.ts @@ -0,0 +1,15 @@ +import {Table, Column, PrimaryKey, Model} from 'sequelize-typescript'; +import sequelize from 'sequelize'; + +@Table +export default class KeyValueCache extends Model { + @PrimaryKey + @Column + key!: string; + + @Column(sequelize.TEXT) + value!: string; + + @Column + expiresAt!: Date; +} -- cgit v1.2.3 From 04c7e61fc076e2fa5ddf3d0faf6ebb73f4d52d82 Mon Sep 17 00:00:00 2001 From: Max Isom Date: Thu, 18 Nov 2021 20:55:57 -0500 Subject: Add FileCache model --- src/models/file-cache.ts | 14 ++++++++++++++ src/models/index.ts | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 src/models/file-cache.ts (limited to 'src/models') diff --git a/src/models/file-cache.ts b/src/models/file-cache.ts new file mode 100644 index 0000000..4846ba3 --- /dev/null +++ b/src/models/file-cache.ts @@ -0,0 +1,14 @@ +import {Table, Column, PrimaryKey, Model} from 'sequelize-typescript'; + +@Table +export default class FileCache extends Model { + @PrimaryKey + @Column + hash!: string; + + @Column + kbits!: number; + + @Column + accessedAt!: Date; +} diff --git a/src/models/index.ts b/src/models/index.ts index d39a3dc..e3f7c0a 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -1,8 +1,10 @@ +import FileCache from './file-cache.js'; import KeyValueCache from './key-value-cache.js'; import Settings from './settings.js'; import Shortcut from './shortcut.js'; export { + FileCache, KeyValueCache, Settings, Shortcut, -- cgit v1.2.3 From f5149dfaba64c62f0a9ea6deab600b3d4d9b0f39 Mon Sep 17 00:00:00 2001 From: Max Isom Date: Fri, 19 Nov 2021 12:13:45 -0500 Subject: Move file caching logic to new FileCache service Also: removes the -re ffmpeg option. If this option is passed, ffmpeg won't write to fs-capacitor (and the cache file) as fast as possible. In other words, the cache file won't finish writing until the entire stream has been played. --- src/models/file-cache.ts | 4 ++-- src/models/key-value-cache.ts | 2 +- src/models/settings.ts | 2 +- src/models/shortcut.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/models') diff --git a/src/models/file-cache.ts b/src/models/file-cache.ts index 4846ba3..dbac6d3 100644 --- a/src/models/file-cache.ts +++ b/src/models/file-cache.ts @@ -1,13 +1,13 @@ import {Table, Column, PrimaryKey, Model} from 'sequelize-typescript'; @Table -export default class FileCache extends Model { +export default class FileCache extends Model { @PrimaryKey @Column hash!: string; @Column - kbits!: number; + bytes!: number; @Column accessedAt!: Date; diff --git a/src/models/key-value-cache.ts b/src/models/key-value-cache.ts index 795ff75..5072538 100644 --- a/src/models/key-value-cache.ts +++ b/src/models/key-value-cache.ts @@ -2,7 +2,7 @@ import {Table, Column, PrimaryKey, Model} from 'sequelize-typescript'; import sequelize from 'sequelize'; @Table -export default class KeyValueCache extends Model { +export default class KeyValueCache extends Model { @PrimaryKey @Column key!: string; diff --git a/src/models/settings.ts b/src/models/settings.ts index 29c2b3e..3318c47 100644 --- a/src/models/settings.ts +++ b/src/models/settings.ts @@ -1,7 +1,7 @@ import {Table, Column, PrimaryKey, Model, Default} from 'sequelize-typescript'; @Table -export default class Settings extends Model { +export default class Settings extends Model { @PrimaryKey @Column guildId!: string; diff --git a/src/models/shortcut.ts b/src/models/shortcut.ts index 7ce1177..4ec88ed 100644 --- a/src/models/shortcut.ts +++ b/src/models/shortcut.ts @@ -1,7 +1,7 @@ import {Table, Column, PrimaryKey, Model, AutoIncrement, Index} from 'sequelize-typescript'; @Table -export default class Shortcut extends Model { +export default class Shortcut extends Model { @PrimaryKey @AutoIncrement @Column -- cgit v1.2.3