Merge branch 'prettier'

This commit is contained in:
Yanick Champoux 2024-02-01 13:50:03 -05:00
commit ae91cf8e65
3 changed files with 71 additions and 65 deletions

View File

@ -1,8 +0,0 @@
{
"useTabs": true,
"singleQuote": true,
"trailingComma": "none",
"printWidth": 100,
"plugins": ["prettier-plugin-svelte"],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
}

12
.prettierrc.cjs Normal file
View File

@ -0,0 +1,12 @@
module.exports = {
semi: true,
trailingComma: 'all',
singleQuote: true,
printWidth: 80,
tabWidth: 4,
useTabs: false,
plugins: ['prettier-plugin-svelte'],
svelteSortOrder: 'options-markup-scripts-styles',
svelteStrictMode: false,
svelteAllowShorthand: true,
};

View File

@ -2,23 +2,23 @@ import { load } from 'cheerio';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import DB from 'better-sqlite3'; import DB from 'better-sqlite3';
const db_file = process.env.DATABASE_URL.replace('sqlite3:',''); const db_file = process.env.DATABASE_URL.replace('sqlite3:', '');
const db = DB(db_file); const db = DB(db_file);
db.pragma('journal_mode = WAL'); db.pragma('journal_mode = WAL');
export async function fetch_guild_users (guild_id) { export async function fetch_guild_users(guild_id) {
const res = await fetch(`https://boardgamegeek.com/xmlapi2/guild?members=1&id=`+guild_id); const res = await fetch(`https://boardgamegeek.com/xmlapi2/guild?members=1&id=` + guild_id);
if( res.status === 200 ) { if (res.status === 200) {
const $page = load(await res.text()); const $page = load(await res.text());
const users = []; const users = [];
$page('member').each( function(i,member) { $page('member').each(function (i, member) {
users.push( $page(this).attr('name')); users.push($page(this).attr('name'));
}); });
const insert = db.prepare( 'INSERT OR IGNORE INTO bgg_user (username) VALUES(@username)' ); const insert = db.prepare('INSERT OR IGNORE INTO bgg_user (username) VALUES(@username)');
users.forEach( username => insert.run({username})); users.forEach((username) => insert.run({ username }));
return users; return users;
} }
@ -27,12 +27,11 @@ export async function fetch_guild_users (guild_id) {
} }
export function extract_user_forsale(page) { export function extract_user_forsale(page) {
const $ = load(page); const $ = load(page);
const games = []; const games = [];
const data = $('item').map( function (i,item) { const data = $('item').map(function (i, item) {
const data = {}; const data = {};
data.bgg_id = $(this).attr('objectid'); data.bgg_id = $(this).attr('objectid');
data.name = $(this).find('name').text(); data.name = $(this).find('name').text();
@ -40,29 +39,30 @@ export function extract_user_forsale(page) {
data.notes = $(this).find('conditiontext').text(); data.notes = $(this).find('conditiontext').text();
const find_price = data.notes.match(/\$(\d+)/); const find_price = data.notes.match(/\$(\d+)/);
data.price = undefined; data.price = undefined;
if(find_price ) data.price = parseInt(find_price[1]); if (find_price) data.price = parseInt(find_price[1]);
games.push(data); games.push(data);
}) });
return games; return games;
} }
async function fetch_user_forsale(username,n=1) { async function fetch_user_forsale(username, n = 1) {
if(n>5) throw new Error("couldn't get collection"); if (n > 5) throw new Error("couldn't get collection");
const res = await fetch(`https://boardgamegeek.com/xmlapi2/collection?trade=1&username=${username}`); const res = await fetch(
`https://boardgamegeek.com/xmlapi2/collection?trade=1&username=${username}`
);
if ( res.status === 202 ) { if (res.status === 202) {
return new Promise( (accept,reject) => { return new Promise((accept, reject) => {
setTimeout(()=> { setTimeout(() => {
fetch_user_forsale(username,n+1).then(accept) fetch_user_forsale(username, n + 1).then(accept);
}, 2000) }, 2000);
}) });
} }
if( res.status === 200 ) if (res.status === 200) return extract_user_forsale(await res.text());
return extract_user_forsale( await res.text() );
throw new Error("couldn't get the collection for " + username); throw new Error("couldn't get the collection for " + username);
} }
@ -72,21 +72,23 @@ async function update_user_games(username) {
// TODO only change the games that changed // TODO only change the games that changed
// TODO only change users that got added or removed // TODO only change users that got added or removed
const insert = db.prepare( 'INSERT into game (username, bgg_id, name, thumbnail, notes,price) VALUES(@username,@bgg_id,@name,@thumbnail,@notes,@price)' ); const insert = db.prepare(
'INSERT into game (username, bgg_id, name, thumbnail, notes,price) VALUES(@username,@bgg_id,@name,@thumbnail,@notes,@price)'
);
await db.prepare('DELETE FROM game where username = @username').run({username}); await db.prepare('DELETE FROM game where username = @username').run({ username });
for ( let game of games ) { for (let game of games) {
console.log(game); console.log(game);
insert.run({ insert.run({
username, username,
...game ...game
}); });
} }
} }
await update_user_games('yenzie').then( () => console.log('is done')).catch( e => console.error(e)); await update_user_games('yenzie')
.then(() => console.log('is done'))
.catch((e) => console.error(e));
/* /*
const usernames = await fetch_guild_users('1610'); const usernames = await fetch_guild_users('1610');