Skip to content

Commit

Permalink
refactored, generalized exterior parsing #24
Browse files Browse the repository at this point in the history
  • Loading branch information
@gergelyszabo94
gergelyszabo94 committed Jun 10, 2019
1 parent 6d67de7 commit 31cf32a
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 69 deletions.
9 changes: 5 additions & 4 deletions js/background_scripts/messaging.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ chrome.runtime.onMessage.addListener(
let marketlink = "https://steamcommunity.com/market/listings/730/" + items[item].market_hash_name;
let classid = items[item].classid;
let instanceid = items[item].instanceid;
let exterior = items[item].descriptions[0].value.split('Exterior: ')[1];
exterior = exterior === undefined ? "" : exterior;
let shortExterior = shortenExterior(exterior);
// let exterior = items[item].descriptions[0].value.split('Exterior: ')[1];
// exterior = exterior === undefined ? "" : exterior;
// let shortExterior = shortenExterior(exterior);
let exterior = getExteriorFromTags(items[item].tags);
console.log(exterior);
let tradability = "Tradable";
let tradabilityShort = "T";
let dopplerInfo = undefined;
Expand Down Expand Up @@ -113,7 +115,6 @@ chrome.runtime.onMessage.addListener(
tradabilityShort: tradabilityShort,
dopplerInfo: dopplerInfo,
exterior: exterior,
shortExterior: shortExterior,
iconURL: icon,
inspectLink: inspectLink,
quality: quality,
Expand Down
54 changes: 28 additions & 26 deletions js/content_scripts/steam/inventory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,28 +75,28 @@ const dopplerPhase = "<div class='dopplerPhase'><span></span></div>";

const exteriors1 = `
<div class="descriptor otherExteriors" id="otherExteriors1">
<span>Links to other exteriors:</span>
<span>${chrome.i18n.getMessage("links_to_other_exteriors")}:</span>
<ul>
<li><a href="" target="_blank" id="fnLink1">Factory New</a> - <a href="" target="_blank" id="fnSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ Factory New</span></a></li>
<li><a href="" target="_blank" id="mwLink1">Minimal Wear</a> - <a href="" target="_blank" id="mwSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ Minimal Wear</span></a></li>
<li><a href="" target="_blank" id="ftLink1">Field-Tested</a> - <a href="" target="_blank" id="ftSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ Field-Tested</span></a></li>
<li><a href="" target="_blank" id="wwLink1">Well-Worn</a> - <a href="" target="_blank" id="wwSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ Well-Worn</span></a></li>
<li><a href="" target="_blank" id="bsLink1">Battle-Scarred</a> - <a href="" target="_blank" id="bsSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ Battle-Scarred</span></a></li>
<li><a href="" target="_blank" id="fnLink1">${exteriors.factory_new.localized_name}</a> - <a href="" target="_blank" id="fnSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.factory_new.localized_name}</span></a></li>
<li><a href="" target="_blank" id="mwLink1">${exteriors.minimal_wear.localized_name}</a> - <a href="" target="_blank" id="mwSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.minimal_wear.localized_name}</span></a></li>
<li><a href="" target="_blank" id="ftLink1">${exteriors.field_tested.localized_name}</a> - <a href="" target="_blank" id="ftSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.field_tested.localized_name}</span></a></li>
<li><a href="" target="_blank" id="wwLink1">${exteriors.well_worn.localized_name}</a> - <a href="" target="_blank" id="wwSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.well_worn.localized_name}</span></a></li>
<li><a href="" target="_blank" id="bsLink1">${exteriors.battle_scarred.localized_name}</a> - <a href="" target="_blank" id="bsSTLink1"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.battle_scarred.localized_name}</span></a></li>
</ul>
<span>Not every item is available in every exterior</span>
<span>${chrome.i18n.getMessage("not_every_available")}</span>
</div>`;

const exteriors0 = `
<div class="descriptor otherExteriors" id="otherExteriors0">
<span>Links to other exteriors:</span>
<span>${chrome.i18n.getMessage("links_to_other_exteriors")}:</span>
<ul>
<li><a href="" target="_blank" id="fnLink0">Factory New</a> - <a href="" target="_blank" id="fnSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ Factory New</span></a></li>
<li><a href="" target="_blank" id="mwLink0">Minimal Wear</a> - <a href="" target="_blank" id="mwSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ Minimal Wear</span></a></li>
<li><a href="" target="_blank" id="ftLink0">Field-Tested</a> - <a href="" target="_blank" id="ftSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ Field-Tested</span></a></li>
<li><a href="" target="_blank" id="wwLink0">Well-Worn</a> - <a href="" target="_blank" id="wwSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ Well-Worn</span></a></li>
<li><a href="" target="_blank" id="bsLink0">Battle-Scarred</a> - <a href="" target="_blank" id="bsSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ Battle-Scarred</span></a></li>
<li><a href="" target="_blank" id="fnLink0">${exteriors.factory_new.localized_name}</a> - <a href="" target="_blank" id="fnSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.factory_new.localized_name}</span></a></li>
<li><a href="" target="_blank" id="mwLink0">${exteriors.minimal_wear.localized_name}</a> - <a href="" target="_blank" id="mwSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.minimal_wear.localized_name}</span></a></li>
<li><a href="" target="_blank" id="ftLink0">${exteriors.field_tested.localized_name}</a> - <a href="" target="_blank" id="ftSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.field_tested.localized_name}</span></a></li>
<li><a href="" target="_blank" id="wwLink0">${exteriors.well_worn.localized_name}</a> - <a href="" target="_blank" id="wwSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.well_worn.localized_name}</span></a></li>
<li><a href="" target="_blank" id="bsLink0">${exteriors.battle_scarred.localized_name}</a> - <a href="" target="_blank" id="bsSTLink0"><span class="stattrakOrange exteriorsLink">StatTrak™ ${exteriors.battle_scarred.localized_name}</span></a></li>
</ul>
<span>Not every item is available in every exterior</span>
<span>${chrome.i18n.getMessage("not_every_available")}</span>
</div>`;

const stickers1 = `
Expand Down Expand Up @@ -287,7 +287,9 @@ function addPerItemInfo(updating){
souvenir = "S";
}

$item.append(`<div class='exteriorSTInfo'><span class="souvenirYellow">${souvenir}</span><span class="stattrakOrange">${stattrak}</span><span class="exteriorIndicator">${item.shortExterior}</span></div>`);
if(item.exterior!==undefined){
$item.append(`<div class='exteriorSTInfo'><span class="souvenirYellow">${souvenir}</span><span class="stattrakOrange">${stattrak}</span><span class="exteriorIndicator">${item.exterior.localized_short}</span></div>`);
}

$(this).attr("data-processed", true);
}
Expand Down Expand Up @@ -567,43 +569,43 @@ function addElements(){

$fnst1=$("#fnSTLink1");
$fnst1.attr("href", genericMarketLink + souvenir + weaponName + "%28Factory%20New%29");
$fnst1.find("span").text("Souvenir Factory New");
$fnst1.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.factory_new.localized_name);

$mwst1=$("#mwSTLink1");
$mwst1.attr("href", genericMarketLink + souvenir + weaponName + "%28Minimal%20Wear%29");
$mwst1.find("span").text("Souvenir Minimal Wear");
$mwst1.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.minimal_wear.localized_name);

$ftst1=$("#ftSTLink1");
$ftst1.attr("href", genericMarketLink + souvenir + weaponName + "%28Field-Tested%29");
$ftst1.find("span").text("Souvenir Field-Tested");
$ftst1.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.field_tested.localized_name);

$wwst1=$("#wwSTLink1");
$wwst1.attr("href", genericMarketLink + souvenir + weaponName + "%28Well-Worn%29");
$wwst1.find("span").text("Souvenir Well-Worn");
$wwst1.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.well_worn.localized_name);

$bsst1=$("#bsSTLink1");
$bsst1.attr("href", genericMarketLink + souvenir + weaponName + "%28Battle-Scarred%29");
$bsst1.find("span").text("Souvenir Battle-Scarred");
$bsst1.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.battle_scarred.localized_name);

$fnst0=$("#fnSTLink0");
$fnst0.attr("href", genericMarketLink + souvenir + weaponName + "%28Factory%20New%29");
$fnst0.find("span").text("Souvenir Factory New");
$fnst0.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.factory_new.localized_name);

$mwst0=$("#mwSTLink0");
$mwst0.attr("href", genericMarketLink + souvenir + weaponName + "%28Minimal%20Wear%29");
$mwst0.find("span").text("Souvenir Minimal Wear");
$mwst0.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.minimal_wear.localized_name);

$ftst0=$("#ftSTLink0");
$ftst0.attr("href", genericMarketLink + souvenir + weaponName + "%28Field-Tested%29");
$ftst0.find("span").text("Souvenir Field-Tested");
$ftst0.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.field_tested.localized_name);

$wwst0=$("#wwSTLink0");
$wwst0.attr("href", genericMarketLink + souvenir + weaponName + "%28Well-Worn%29");
$wwst0.find("span").text("Souvenir Well-Worn");
$wwst0.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.well_worn.localized_name);

$bsst0=$("#bsSTLink0");
$bsst0.attr("href", genericMarketLink + souvenir + weaponName + "%28Battle-Scarred%29");
$bsst0.find("span").text("Souvenir Battle-Scarred");
$bsst0.find("span").text(chrome.i18n.getMessage("souvenir")+ exteriors.battle_scarred.localized_name);
}
else{
$sv = $(".souvenirYellow.exteriorsLink");
Expand All @@ -624,7 +626,7 @@ function addElements(){
$("#bsSTLink0").attr("href", genericMarketLink + star + stattrak + weaponName + "%28Battle-Scarred%29");
}

if(item.exterior===""){
if(item.exterior===undefined){
$("#otherExteriors1").hide();
$("#otherExteriors0").hide();
}
Expand Down
44 changes: 22 additions & 22 deletions js/content_scripts/steam/marketListing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ let scriptToInject = `<script id="getItems">
</script>`;
$("body").append(scriptToInject);

const exteriors = `
const exteriorselement = `
<div class="descriptor otherExteriors" id="otherExteriors">
<span>${chrome.i18n.getMessage("links_to_other_exteriors")}:</span>
<ul>
<li><a href="" target="_blank" id="fnLink">${chrome.i18n.getMessage("fn_long")}</a> - <a href="" target="_blank" id="fnSTLink"><span class="stattrakOrange">StatTrak™ ${chrome.i18n.getMessage("fn_long")}</span></a></li>
<li><a href="" target="_blank" id="mwLink">${chrome.i18n.getMessage("mw_long")}</a> - <a href="" target="_blank" id="mwSTLink"><span class="stattrakOrange">StatTrak™ ${chrome.i18n.getMessage("mw_long")}</span></a></li>
<li><a href="" target="_blank" id="ftLink">${chrome.i18n.getMessage("ft_long")}</a> - <a href="" target="_blank" id="ftSTLink"><span class="stattrakOrange">StatTrak™ ${chrome.i18n.getMessage("ft_long")}</span></a></li>
<li><a href="" target="_blank" id="wwLink">${chrome.i18n.getMessage("ww_long")}</a> - <a href="" target="_blank" id="wwSTLink"><span class="stattrakOrange">StatTrak™ ${chrome.i18n.getMessage("ww_long")}</span></a></li>
<li><a href="" target="_blank" id="bsLink">${chrome.i18n.getMessage("bs_long")}</a> - <a href="" target="_blank" id="bsSTLink"><span class="stattrakOrange">StatTrak™ ${chrome.i18n.getMessage("bs_long")}</span></a></li>
<li><a href="" target="_blank" id="fnLink">${exteriors.factory_new.localized_name}</a> - <a href="" target="_blank" id="fnSTLink"><span class="stattrakOrange">StatTrak™ ${exteriors.factory_new.localized_name}</span></a></li>
<li><a href="" target="_blank" id="mwLink">${exteriors.minimal_wear.localized_name}</a> - <a href="" target="_blank" id="mwSTLink"><span class="stattrakOrange">StatTrak™ ${exteriors.minimal_wear.localized_name}</span></a></li>
<li><a href="" target="_blank" id="ftLink">${exteriors.field_tested.localized_name}</a> - <a href="" target="_blank" id="ftSTLink"><span class="stattrakOrange">StatTrak™ ${exteriors.field_tested.localized_name}</span></a></li>
<li><a href="" target="_blank" id="wwLink">${exteriors.well_worn.localized_name}</a> - <a href="" target="_blank" id="wwSTLink"><span class="stattrakOrange">StatTrak™ ${exteriors.well_worn.localized_name}</span></a></li>
<li><a href="" target="_blank" id="bsLink">${exteriors.battle_scarred.localized_name}</a> - <a href="" target="_blank" id="bsSTLink"><span class="stattrakOrange">StatTrak™ ${exteriors.battle_scarred.localized_name}</span></a></li>
</ul>
<span>${chrome.i18n.getMessage("not_every_available")}</span>
</div>`;
Expand All @@ -72,7 +72,7 @@ const dopplerPhase = "<div class='dopplerPhaseMarket'><span></span></div>";

let thereSouvenirForThisItem = souvenirExists($(".descriptor").text());

$("#largeiteminfo_item_descriptors").append(exteriors);
$("#largeiteminfo_item_descriptors").append(exteriorselement);

const genericMarketLink = "https://steamcommunity.com/market/listings/730/";
const stattrak = "StatTrak%E2%84%A2%20";
Expand Down Expand Up @@ -118,30 +118,30 @@ if(isSouvenir||thereSouvenirForThisItem){

$fnst=$("#fnSTLink");
$fnst.attr("href", genericMarketLink + souvenir + weaponName + "(Factory New)");
$fnst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + chrome.i18n.getMessage("fn_long"));
$fnst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + exteriors.factory_new.localized_name);

$mwst=$("#mwSTLink");
$mwst.attr("href", genericMarketLink + souvenir + weaponName + "(Minimal Wear)");
$mwst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + chrome.i18n.getMessage("mw_long"));
$mwst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + exteriors.minimal_wear.localized_name);

$ftst=$("#ftSTLink");
$ftst.attr("href", genericMarketLink + souvenir + weaponName + "(Field-Tested)");
$ftst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + chrome.i18n.getMessage("ft_long"));
$ftst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + field_tested.localized_name);

$wwst=$("#wwSTLink");
$wwst.attr("href", genericMarketLink + souvenir + weaponName + "(Well-Worn)");
$wwst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + chrome.i18n.getMessage("ww_long"));
$wwst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + exteriors.well_worn.localized_name);

$bsst=$("#bsSTLink");
$bsst.attr("href", genericMarketLink + souvenir + weaponName + "(Battle-Scarred)");
$bsst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + chrome.i18n.getMessage("bs_long"));
$bsst.find("span").text(chrome.i18n.getMessage("souvenir")+" " + exteriors.battle_scarred.localized_name);
}
else{
$("#fnSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + "(Factory New)");
$("#mwSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + "(Minimal Wear)");
$("#ftSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + "(Field-Tested)");
$("#wwSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + "(Well-Worn)");
$("#bsSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + "(Battle-Scarred)");
$("#fnSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + `(${exteriors.factory_new.name})`);
$("#mwSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + `(${exteriors.minimal_wear.name})`);
$("#ftSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + `(${exteriors.field_tested.name})`);
$("#wwSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + `(${exteriors.well_worn.name})`);
$("#bsSTLink").attr("href", genericMarketLink + star + stattrak + weaponName + `(${exteriors.battle_scarred.name})`);
}

$("#largeiteminfo_item_actions").append(inBrowserInspectButton);
Expand Down Expand Up @@ -195,11 +195,11 @@ $("#get_float").click(function () {
<svg id="floatPointer" class="floatPointer" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z"></path></svg>
</div>
<div class="progress">
<div class="progress-bar floatBarFN" title="${chrome.i18n.getMessage("fn_long")}"></div>
<div class="progress-bar floatBarMW" title="${chrome.i18n.getMessage("mw_long")}"></div>
<div class="progress-bar floatBarFT" title="${chrome.i18n.getMessage("ft_long")}"></div>
<div class="progress-bar floatBarWW" title="${chrome.i18n.getMessage("ww_long")}"></div>
<div class="progress-bar floatBarBS" title="${chrome.i18n.getMessage("bs_long")}"></div>
<div class="progress-bar floatBarFN" title="${exteriors.factory_new.localized_name}"></div>
<div class="progress-bar floatBarMW" title="${exteriors.minimal_wear.localized_name}"></div>
<div class="progress-bar floatBarFT" title="${exteriors.field_tested.localized_name}"></div>
<div class="progress-bar floatBarWW" title="${exteriors.well_worn.localized_name}"></div>
<div class="progress-bar floatBarBS" title="${exteriors.battle_scarred.localized_name}"></div>
</div>
<div class="showTechnical">Show Technical</div>
<div class="floatTechnical">
Expand Down
Loading

0 comments on commit 31cf32a

Please sign in to comment.