Skip to content

Commit

Permalink
collection: switch to dot notation in file names
Browse files Browse the repository at this point in the history
  • Loading branch information
shagu committed Jan 3, 2023
1 parent 1f256eb commit 5ce972c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
19 changes: 8 additions & 11 deletions collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ const collection = {
add_card: async (card) => {
await core.metadata.update_card(card)

let suffix = `${card.set}:${card.number}:${card.language}`
suffix = card.foil ? `${suffix}:f` : suffix

let name = card.name ? card.name : "Unknown"
name = name.replaceAll('/', '|')
let suffix = `${card.set}.${card.number}.${card.language}`
suffix = card.foil ? `${suffix}.f` : suffix

let count = 1
let filename = `${name} [${suffix}].jpg`
let filename = `[${suffix}](${count}).jpg`

while(fs.existsSync(path.join(core.folder, card.path, filename))) {
filename = `${name} (${count}) [${suffix}].jpg`
filename = `[${suffix}](${count}).jpg`
count++
}

Expand Down Expand Up @@ -64,7 +61,7 @@ const collection = {
let parse = file.match(/(.*?) ?\[(.*)\]/i)
if (parse && parse[2]) {
let name = parse[1] == '' ? 'Unknown' : parse[1]
let meta = parse[2].split(":")
let meta = parse[2].split(".")

name = name.replaceAll('|', '/')

Expand Down Expand Up @@ -126,10 +123,10 @@ const collection = {
}

core.electron.ipcMain.handle('load-card', async (event, card) => {
let suffix = `${card.set}:${card.number}:${card.language}`
suffix = card.foil ? `${suffix}:f` : suffix
let suffix = `${card.set}.${card.number}.${card.language}`
suffix = card.foil ? `${suffix}.f` : suffix

card.file = path.join(core.data_directory, "images", `preview_${suffix}.jpg`)
card.file = path.join(core.data_directory, "images", `preview_[${suffix}].jpg`)

if (!fs.existsSync(card.file)) {
await core.metadata.get_image(card, true)
Expand Down
4 changes: 2 additions & 2 deletions metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ let metadata = {
core.utils.popup(`Scryfall Download: ${card.set}:${card.number}`, caption, status.percent/100)
}

const image = path.join(core.data_directory, "images", `${preview ? 'preview' : 'full'}_${card.set}:${card.number}:${card.language}${card.foil ? ':f' : ''}.jpg`)
const fallback = path.join(core.data_directory, "images", `${preview ? 'preview' : 'full'}_${card.set}:${card.number}:en${card.foil ? ':f' : ''}.jpg`)
const image = path.join(core.data_directory, "images", `${preview ? 'preview' : 'full'}_[${card.set}.${card.number}.${card.language}${card.foil ? '.f' : ''}].jpg`)
const fallback = path.join(core.data_directory, "images", `${preview ? 'preview' : 'full'}_[${card.set}.${card.number}.en${card.foil ? '.f' : ''}].jpg`)

// fetch image
if(!fs.existsSync(image)) {
Expand Down
2 changes: 1 addition & 1 deletion ui/frontend.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ collection.new_card = async () => {
if(!collection.selection) return

const ui_card = collection.selection
const identifier = `[${ui_card.set}:${ui_card.number}:${ui_card.language}${ui_card.foil ? ':f' : ''}]`
const identifier = `[${ui_card.set}.${ui_card.number}.${ui_card.language}${ui_card.foil ? '.f' : ''}]`

popups.show(`${ui_card.name}`, identifier, 0)
const new_card = await collection.invoke['add-card'](ui_card)
Expand Down

0 comments on commit 5ce972c

Please sign in to comment.