Skip to content

Commit

Permalink
New measurements and results.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaakkopasanen committed Apr 21, 2024
1 parent 8db5ef9 commit 706974a
Show file tree
Hide file tree
Showing 1,345 changed files with 201,106 additions and 2,142 deletions.
91 changes: 16 additions & 75 deletions dbtools/db.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "a99e7791-660c-49de-b312-5b99455a5a69",
"metadata": {},
"outputs": [],
Expand All @@ -13,7 +13,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"id": "c94122fc-dece-4a36-92d9-9b6b7f892519",
"metadata": {},
"outputs": [],
Expand All @@ -27,7 +27,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "83685ae7-7f31-429c-baf9-8e0a458a53dd",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -214,7 +214,7 @@
"metadata": {},
"outputs": [],
"source": [
"crawler.process(new_only=False)"
"crawler.process(new_only=True)"
]
},
{
Expand Down Expand Up @@ -298,7 +298,7 @@
"source": [
"manager = SquigCrawlerManager()\n",
"#print(', '.join(sorted([crawler.username for crawler in manager.crawlers])))\n",
"print(json.dumps({crawler.username: crawler.name for crawler in sorted(manager.crawlers, key=lambda c: c.username)}, indent=4, ensure_ascii=False))"
"#print(json.dumps({crawler.username: crawler.name for crawler in sorted(manager.crawlers, key=lambda c: c.username)}, indent=4, ensure_ascii=False))"
]
},
{
Expand Down Expand Up @@ -361,6 +361,14 @@
"manager.process('Hi End Portable', new_only=True)"
]
},
{
"cell_type": "markdown",
"id": "55d31645-6c65-4030-b2c8-f273be273c1c",
"metadata": {},
"source": [
"**TODO:** DHRME over-ear rig"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -821,7 +829,7 @@
"metadata": {},
"outputs": [],
"source": [
"prune_results(databases=['crinacle', 'oratory1990', 'Rtings', 'Harpo', 'Kazi', 'Regan Cipher'], dry_run=False)"
"prune_results(databases=['crinacle', 'oratory1990', 'Rtings', 'Harpo', 'Kazi', 'Regan Cipher'], dry_run=True)"
]
},
{
Expand Down Expand Up @@ -1405,77 +1413,10 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "67b4aa57-c478-47b5-b140-272ef4a93b07",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Creating ranking index...\n"
]
},
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "16480c6774ca4a1a8fdeeba2bdc9c902",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
" 0%| | 0/5077 [00:00<?, ?it/s]"
]
},
"metadata": {},
"output_type": "display_data"
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Creating recommendations index...\n",
"Creating full index...\n",
"Creating source indices...\n",
"Creating HeSuVi ZIP archive...\n"
]
},
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "884f68a3d90d40f0877b39eb8b50a4cf",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
" 0%| | 0/5077 [00:00<?, ?it/s]"
]
},
"metadata": {},
"output_type": "display_data"
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Creating webapp data...\n"
]
},
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "0037a102cfb94b5bad545df05b7e880b",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
" 0%| | 0/5077 [00:00<?, ?it/s]"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"update_all_indexes()"
]
Expand Down
11 changes: 9 additions & 2 deletions dbtools/manufacturers.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ Daiso
Dali
Dan Clark Audio MrSpeakers DCA (Dan Clark Audio) MrSpeakers (Dan Clark Audio)
Dark Project
DCMEKA
ddHiFi
Debauche Bacchus DB
Delta Air
Expand All @@ -170,6 +171,7 @@ Effect Audio
EKSA
ELECOM
Electronica
ELISE AUDIO
Elysian Elysian Acoustic Labs
Emotiva Etimova
Empire Ears
Expand All @@ -186,6 +188,7 @@ ETA
Eternal Melody
Etymotic
FAAEAL
Fairphone
Fanny Wang
Fatfreq
FAudio
Expand Down Expand Up @@ -243,6 +246,7 @@ Heavys
HEDD Heinz Electrodynamic Designs (HEDD)
Heir Audio
Hessian
Hi-Fri Audio
HiBy
Hidition
Hidizs
Expand All @@ -262,7 +266,7 @@ HZSOUND
I-INTO
I-Mego
iBasso
Ice Lab
Ice Lab Icelabs
iClever
iHarmonix
IKKO
Expand All @@ -273,6 +277,7 @@ InEar
Insignia
Intime
Intro
IO Audio I/O
iSK
ISN AUDIO ISN
Itsfit Lab ItsFit Lab
Expand All @@ -296,7 +301,7 @@ Kaiku
Kaldas Research
KBEAR KBEar KB Ear
KEF
Kefine Klanar
KEFINE
Kennerton
Kenwood
KFA2
Expand Down Expand Up @@ -376,6 +381,7 @@ MUNITIO
Muse HiFi
Music Hall Audio Music Hall
Musical Fidelity
MYER-AUDIO Myer Audio
MySphere
MyST
NAD
Expand All @@ -390,6 +396,7 @@ Neusonik
NF Audio NFAudio
NHT
NiceHCK
Nightjar Nightjar Acoustics
Night Oblivion
Nintendo
Nixon
Expand Down
7 changes: 6 additions & 1 deletion dbtools/squig_crawler.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,16 @@ def crawl(self):
if re.search(r'Target.txt$', file_name) or file_name == 'phone_book.json': # Skip targets and book
continue
normalized_file_name = self.normalize_file_name(urllib.parse.unquote(file_name))
try:
rig = _squig_rigs[self.name][form]
except KeyError as err:
print(f'{self.name} has no rig for {form}. Skipping {normalized_file_name}')
continue
item = NameItem(
url=f'{self.db_url(db)}/{anchor["href"]}',
source_name=book[normalized_file_name] if normalized_file_name in book else None,
form=form,
rig=_squig_rigs[self.name][form]
rig=rig
)
self.resolve(item)
self.crawl_index.add(item)
Expand Down
2 changes: 2 additions & 0 deletions measurements/Auriculares Argentina/name_index.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ https://auricularesargentina.squig.link/data/he400se%20L.txt Hifiman he400se HIF
https://auricularesargentina.squig.link/data/he400se%20R.txt Hifiman he400se HIFIMAN HE400se over-ear KB501x + 711
https://auricularesargentina.squig.link/data/sundara%20close%20L.txt HIFIMAN Sundara Closed-Back over-ear KB501x + 711
https://auricularesargentina.squig.link/data/sundara%20close%20R.txt HIFIMAN Sundara Closed-Back over-ear KB501x + 711
https://auricularesargentina.squig.link/data/sundara%20closed%20L.txt Hifiman sundara closed HIFIMAN Sundara Closed-Back over-ear KB501x + 711
https://auricularesargentina.squig.link/data/sundara%20closed%20R.txt Hifiman sundara closed HIFIMAN Sundara Closed-Back over-ear KB501x + 711
https://auricularesargentina.squig.link/data/blackhole%20L.txt HarmonicDyne blackhole HarmonicDyne Black Hole over-ear KB501x + 711
https://auricularesargentina.squig.link/data/blackhole%20R.txt HarmonicDyne blackhole HarmonicDyne Black Hole over-ear KB501x + 711
https://auricularesargentina.squig.link/data/moripods%20L.txt Haylou Haylou Moripods Haylou Moripods in-ear 711
Expand Down
Loading

0 comments on commit 706974a

Please sign in to comment.