fix: analyzer tab always resetting befoe a search, feat: split countries in different utils file

src/components/TheLinkAnalyzerTab.vue

@@ -1,7 +1,8 @@
 <template>
 	<div id="analyzer_tab" class="main_tabcontent image_header" ref="root">
 		<h2 class="page_heading page_heading--capitalize">{{ $t('sidebar.linkAnalyzer') }}</h2>
-		<div v-if="link == ''">
+
+		<div v-if="link === ''">
 			<p>
 				{{ $t('linkAnalyzer.info') }}
 			</p>
@@ -9,10 +10,11 @@
 				{{ $t('linkAnalyzer.useful') }}
 			</p>
 		</div>
-		<div v-else-if="link == 'error'">
+		<div v-else-if="link === 'error'">
 			<h2>{{ $t('linkAnalyzer.linkNotSupported') }}</h2>
 			<p>{{ $t('linkAnalyzer.linkNotSupportedYet') }}</p>
 		</div>
+
 		<div v-else>
 			<header
 				class="inline-flex"
@@ -115,21 +117,21 @@
 
 <script>
 import { socket } from '@/utils/socket'
-import { showView } from '@js/tabs.js'
+import { showView } from '@js/tabs'
-import Utils from '@/utils/utils'
+import { convertDuration } from '@/utils/utils'
+import { COUNTRIES } from '@/utils/countries'
 import EventBus from '@/utils/EventBus'
-import Downloads from '@/utils/downloads'
+import { sendAddToQueue } from '@/utils/downloads'
 
 export default {
-	name: 'the-link-analyzer-tab',
 	data() {
 		return {
+			link: '',
 			title: '',
 			subtitle: '',
 			image: '',
 			data: {},
 			type: '',
-			link: '',
 			id: '0',
 			countries: []
 		}
@@ -137,7 +139,7 @@ export default {
 	methods: {
 		artistView: showView.bind(null, 'artist'),
 		albumView: showView.bind(null, 'album'),
-		convertDuration: Utils.convertDuration,
+		convertDuration,
 		reset() {
 			this.title = 'Loading...'
 			this.subtitle = ''
@@ -148,6 +150,7 @@ export default {
 			this.countries = []
 		},
 		showTrack(data) {
+			this.reset()
 			const {
 				title,
 				title_version,
@@ -167,13 +170,14 @@ export default {
 				let temp = []
 				let chars = [...cc].map(c => c.charCodeAt() + 127397)
 				temp.push(String.fromCodePoint(...chars))
-				temp.push(Utils.COUNTRIES[cc])
+				temp.push(COUNTRIES[cc])
 				this.countries.push(temp)
 			})
 
 			this.data = data
 		},
 		showAlbum(data) {
+			this.reset()
 			const { title, cover_xl, link, id } = data
 
 			this.title = title
@@ -187,7 +191,7 @@ export default {
 			this.link = 'error'
 		},
 		addToQueue(e) {
-			Downloads.sendAddToQueue(e.currentTarget.dataset.link)
+			sendAddToQueue(e.currentTarget.dataset.link)
 		}
 	},
 	mounted() {

src/components/TheSearchBar.vue

@@ -67,7 +67,7 @@ export default {
 					this.$root.$emit('QualityModal:open', term)
 				} else {
 					if (isShowingAnalyzer) {
-						EventBus.$emit('linkAnalyzerTab:reset')
+						// EventBus.$emit('linkAnalyzerTab:reset')
 						socket.emit('analyzeLink', term)
 					} else {
 						// ? Open downloads tab ?

src/utils/countries.js

@@ -0,0 +1,251 @@
+export const COUNTRIES = {
+	AF: 'Afghanistan',
+	AX: '\u00c5land Islands',
+	AL: 'Albania',
+	DZ: 'Algeria',
+	AS: 'American Samoa',
+	AD: 'Andorra',
+	AO: 'Angola',
+	AI: 'Anguilla',
+	AQ: 'Antarctica',
+	AG: 'Antigua and Barbuda',
+	AR: 'Argentina',
+	AM: 'Armenia',
+	AW: 'Aruba',
+	AU: 'Australia',
+	AT: 'Austria',
+	AZ: 'Azerbaijan',
+	BS: 'Bahamas',
+	BH: 'Bahrain',
+	BD: 'Bangladesh',
+	BB: 'Barbados',
+	BY: 'Belarus',
+	BE: 'Belgium',
+	BZ: 'Belize',
+	BJ: 'Benin',
+	BM: 'Bermuda',
+	BT: 'Bhutan',
+	BO: 'Bolivia, Plurinational State of',
+	BQ: 'Bonaire, Sint Eustatius and Saba',
+	BA: 'Bosnia and Herzegovina',
+	BW: 'Botswana',
+	BV: 'Bouvet Island',
+	BR: 'Brazil',
+	IO: 'British Indian Ocean Territory',
+	BN: 'Brunei Darussalam',
+	BG: 'Bulgaria',
+	BF: 'Burkina Faso',
+	BI: 'Burundi',
+	KH: 'Cambodia',
+	CM: 'Cameroon',
+	CA: 'Canada',
+	CV: 'Cape Verde',
+	KY: 'Cayman Islands',
+	CF: 'Central African Republic',
+	TD: 'Chad',
+	CL: 'Chile',
+	CN: 'China',
+	CX: 'Christmas Island',
+	CC: 'Cocos (Keeling) Islands',
+	CO: 'Colombia',
+	KM: 'Comoros',
+	CG: 'Congo',
+	CD: 'Congo, the Democratic Republic of the',
+	CK: 'Cook Islands',
+	CR: 'Costa Rica',
+	CI: "C\u00f4te d'Ivoire",
+	HR: 'Croatia',
+	CU: 'Cuba',
+	CW: 'Cura\u00e7ao',
+	CY: 'Cyprus',
+	CZ: 'Czech Republic',
+	DK: 'Denmark',
+	DJ: 'Djibouti',
+	DM: 'Dominica',
+	DO: 'Dominican Republic',
+	EC: 'Ecuador',
+	EG: 'Egypt',
+	SV: 'El Salvador',
+	GQ: 'Equatorial Guinea',
+	ER: 'Eritrea',
+	EE: 'Estonia',
+	ET: 'Ethiopia',
+	FK: 'Falkland Islands (Malvinas)',
+	FO: 'Faroe Islands',
+	FJ: 'Fiji',
+	FI: 'Finland',
+	FR: 'France',
+	GF: 'French Guiana',
+	PF: 'French Polynesia',
+	TF: 'French Southern Territories',
+	GA: 'Gabon',
+	GM: 'Gambia',
+	GE: 'Georgia',
+	DE: 'Germany',
+	GH: 'Ghana',
+	GI: 'Gibraltar',
+	GR: 'Greece',
+	GL: 'Greenland',
+	GD: 'Grenada',
+	GP: 'Guadeloupe',
+	GU: 'Guam',
+	GT: 'Guatemala',
+	GG: 'Guernsey',
+	GN: 'Guinea',
+	GW: 'Guinea-Bissau',
+	GY: 'Guyana',
+	HT: 'Haiti',
+	HM: 'Heard Island and McDonald Islands',
+	VA: 'Holy See (Vatican City State)',
+	HN: 'Honduras',
+	HK: 'Hong Kong',
+	HU: 'Hungary',
+	IS: 'Iceland',
+	IN: 'India',
+	ID: 'Indonesia',
+	IR: 'Iran, Islamic Republic of',
+	IQ: 'Iraq',
+	IE: 'Ireland',
+	IM: 'Isle of Man',
+	IL: 'Israel',
+	IT: 'Italy',
+	JM: 'Jamaica',
+	JP: 'Japan',
+	JE: 'Jersey',
+	JO: 'Jordan',
+	KZ: 'Kazakhstan',
+	KE: 'Kenya',
+	KI: 'Kiribati',
+	KP: "Korea, Democratic People's Republic of",
+	KR: 'Korea, Republic of',
+	KW: 'Kuwait',
+	KG: 'Kyrgyzstan',
+	LA: "Lao People's Democratic Republic",
+	LV: 'Latvia',
+	LB: 'Lebanon',
+	LS: 'Lesotho',
+	LR: 'Liberia',
+	LY: 'Libya',
+	LI: 'Liechtenstein',
+	LT: 'Lithuania',
+	LU: 'Luxembourg',
+	MO: 'Macao',
+	MK: 'Macedonia, the Former Yugoslav Republic of',
+	MG: 'Madagascar',
+	MW: 'Malawi',
+	MY: 'Malaysia',
+	MV: 'Maldives',
+	ML: 'Mali',
+	MT: 'Malta',
+	MH: 'Marshall Islands',
+	MQ: 'Martinique',
+	MR: 'Mauritania',
+	MU: 'Mauritius',
+	YT: 'Mayotte',
+	MX: 'Mexico',
+	FM: 'Micronesia, Federated States of',
+	MD: 'Moldova, Republic of',
+	MC: 'Monaco',
+	MN: 'Mongolia',
+	ME: 'Montenegro',
+	MS: 'Montserrat',
+	MA: 'Morocco',
+	MZ: 'Mozambique',
+	MM: 'Myanmar',
+	NA: 'Namibia',
+	NR: 'Nauru',
+	NP: 'Nepal',
+	NL: 'Netherlands',
+	NC: 'New Caledonia',
+	NZ: 'New Zealand',
+	NI: 'Nicaragua',
+	NE: 'Niger',
+	NG: 'Nigeria',
+	NU: 'Niue',
+	NF: 'Norfolk Island',
+	MP: 'Northern Mariana Islands',
+	NO: 'Norway',
+	OM: 'Oman',
+	PK: 'Pakistan',
+	PW: 'Palau',
+	PS: 'Palestine, State of',
+	PA: 'Panama',
+	PG: 'Papua New Guinea',
+	PY: 'Paraguay',
+	PE: 'Peru',
+	PH: 'Philippines',
+	PN: 'Pitcairn',
+	PL: 'Poland',
+	PT: 'Portugal',
+	PR: 'Puerto Rico',
+	QA: 'Qatar',
+	RE: 'R\u00e9union',
+	RO: 'Romania',
+	RU: 'Russian Federation',
+	RW: 'Rwanda',
+	BL: 'Saint Barth\u00e9lemy',
+	SH: 'Saint Helena, Ascension and Tristan da Cunha',
+	KN: 'Saint Kitts and Nevis',
+	LC: 'Saint Lucia',
+	MF: 'Saint Martin (French part)',
+	PM: 'Saint Pierre and Miquelon',
+	VC: 'Saint Vincent and the Grenadines',
+	WS: 'Samoa',
+	SM: 'San Marino',
+	ST: 'Sao Tome and Principe',
+	SA: 'Saudi Arabia',
+	SN: 'Senegal',
+	RS: 'Serbia',
+	SC: 'Seychelles',
+	SL: 'Sierra Leone',
+	SG: 'Singapore',
+	SX: 'Sint Maarten (Dutch part)',
+	SK: 'Slovakia',
+	SI: 'Slovenia',
+	SB: 'Solomon Islands',
+	SO: 'Somalia',
+	ZA: 'South Africa',
+	GS: 'South Georgia and the South Sandwich Islands',
+	SS: 'South Sudan',
+	ES: 'Spain',
+	LK: 'Sri Lanka',
+	SD: 'Sudan',
+	SR: 'Suriname',
+	SJ: 'Svalbard and Jan Mayen',
+	SZ: 'Swaziland',
+	SE: 'Sweden',
+	CH: 'Switzerland',
+	SY: 'Syrian Arab Republic',
+	TW: 'Taiwan, Province of China',
+	TJ: 'Tajikistan',
+	TZ: 'Tanzania, United Republic of',
+	TH: 'Thailand',
+	TL: 'Timor-Leste',
+	TG: 'Togo',
+	TK: 'Tokelau',
+	TO: 'Tonga',
+	TT: 'Trinidad and Tobago',
+	TN: 'Tunisia',
+	TR: 'Turkey',
+	TM: 'Turkmenistan',
+	TC: 'Turks and Caicos Islands',
+	TV: 'Tuvalu',
+	UG: 'Uganda',
+	UA: 'Ukraine',
+	AE: 'United Arab Emirates',
+	GB: 'United Kingdom',
+	US: 'United States',
+	UM: 'United States Minor Outlying Islands',
+	UY: 'Uruguay',
+	UZ: 'Uzbekistan',
+	VU: 'Vanuatu',
+	VE: 'Venezuela, Bolivarian Republic of',
+	VN: 'Viet Nam',
+	VG: 'Virgin Islands, British',
+	VI: 'Virgin Islands, U.S.',
+	WF: 'Wallis and Futuna',
+	EH: 'Western Sahara',
+	YE: 'Yemen',
+	ZM: 'Zambia',
+	ZW: 'Zimbabwe'
+}

src/utils/utils.js

@@ -21,7 +21,11 @@ export function isValidURL(text) {
 	let lowerCaseText = text.toLowerCase()
 
 	if (lowerCaseText.startsWith('http')) {
-		if (lowerCaseText.indexOf('deezer.com') >= 0 || lowerCaseText.indexOf('deezer.page.link') >= 0 || lowerCaseText.indexOf('open.spotify.com') >= 0) {
+		if (
+			lowerCaseText.indexOf('deezer.com') >= 0 ||
+			lowerCaseText.indexOf('deezer.page.link') >= 0 ||
+			lowerCaseText.indexOf('open.spotify.com') >= 0
+		) {
 			return true
 		}
 	} else if (lowerCaseText.startsWith('spotify:')) {
@@ -91,263 +95,10 @@ export function copyToClipboard(text) {
 	ghostInput.remove()
 }
 
-export const COUNTRIES = {
-	AF: 'Afghanistan',
-	AX: '\u00c5land Islands',
-	AL: 'Albania',
-	DZ: 'Algeria',
-	AS: 'American Samoa',
-	AD: 'Andorra',
-	AO: 'Angola',
-	AI: 'Anguilla',
-	AQ: 'Antarctica',
-	AG: 'Antigua and Barbuda',
-	AR: 'Argentina',
-	AM: 'Armenia',
-	AW: 'Aruba',
-	AU: 'Australia',
-	AT: 'Austria',
-	AZ: 'Azerbaijan',
-	BS: 'Bahamas',
-	BH: 'Bahrain',
-	BD: 'Bangladesh',
-	BB: 'Barbados',
-	BY: 'Belarus',
-	BE: 'Belgium',
-	BZ: 'Belize',
-	BJ: 'Benin',
-	BM: 'Bermuda',
-	BT: 'Bhutan',
-	BO: 'Bolivia, Plurinational State of',
-	BQ: 'Bonaire, Sint Eustatius and Saba',
-	BA: 'Bosnia and Herzegovina',
-	BW: 'Botswana',
-	BV: 'Bouvet Island',
-	BR: 'Brazil',
-	IO: 'British Indian Ocean Territory',
-	BN: 'Brunei Darussalam',
-	BG: 'Bulgaria',
-	BF: 'Burkina Faso',
-	BI: 'Burundi',
-	KH: 'Cambodia',
-	CM: 'Cameroon',
-	CA: 'Canada',
-	CV: 'Cape Verde',
-	KY: 'Cayman Islands',
-	CF: 'Central African Republic',
-	TD: 'Chad',
-	CL: 'Chile',
-	CN: 'China',
-	CX: 'Christmas Island',
-	CC: 'Cocos (Keeling) Islands',
-	CO: 'Colombia',
-	KM: 'Comoros',
-	CG: 'Congo',
-	CD: 'Congo, the Democratic Republic of the',
-	CK: 'Cook Islands',
-	CR: 'Costa Rica',
-	CI: "C\u00f4te d'Ivoire",
-	HR: 'Croatia',
-	CU: 'Cuba',
-	CW: 'Cura\u00e7ao',
-	CY: 'Cyprus',
-	CZ: 'Czech Republic',
-	DK: 'Denmark',
-	DJ: 'Djibouti',
-	DM: 'Dominica',
-	DO: 'Dominican Republic',
-	EC: 'Ecuador',
-	EG: 'Egypt',
-	SV: 'El Salvador',
-	GQ: 'Equatorial Guinea',
-	ER: 'Eritrea',
-	EE: 'Estonia',
-	ET: 'Ethiopia',
-	FK: 'Falkland Islands (Malvinas)',
-	FO: 'Faroe Islands',
-	FJ: 'Fiji',
-	FI: 'Finland',
-	FR: 'France',
-	GF: 'French Guiana',
-	PF: 'French Polynesia',
-	TF: 'French Southern Territories',
-	GA: 'Gabon',
-	GM: 'Gambia',
-	GE: 'Georgia',
-	DE: 'Germany',
-	GH: 'Ghana',
-	GI: 'Gibraltar',
-	GR: 'Greece',
-	GL: 'Greenland',
-	GD: 'Grenada',
-	GP: 'Guadeloupe',
-	GU: 'Guam',
-	GT: 'Guatemala',
-	GG: 'Guernsey',
-	GN: 'Guinea',
-	GW: 'Guinea-Bissau',
-	GY: 'Guyana',
-	HT: 'Haiti',
-	HM: 'Heard Island and McDonald Islands',
-	VA: 'Holy See (Vatican City State)',
-	HN: 'Honduras',
-	HK: 'Hong Kong',
-	HU: 'Hungary',
-	IS: 'Iceland',
-	IN: 'India',
-	ID: 'Indonesia',
-	IR: 'Iran, Islamic Republic of',
-	IQ: 'Iraq',
-	IE: 'Ireland',
-	IM: 'Isle of Man',
-	IL: 'Israel',
-	IT: 'Italy',
-	JM: 'Jamaica',
-	JP: 'Japan',
-	JE: 'Jersey',
-	JO: 'Jordan',
-	KZ: 'Kazakhstan',
-	KE: 'Kenya',
-	KI: 'Kiribati',
-	KP: "Korea, Democratic People's Republic of",
-	KR: 'Korea, Republic of',
-	KW: 'Kuwait',
-	KG: 'Kyrgyzstan',
-	LA: "Lao People's Democratic Republic",
-	LV: 'Latvia',
-	LB: 'Lebanon',
-	LS: 'Lesotho',
-	LR: 'Liberia',
-	LY: 'Libya',
-	LI: 'Liechtenstein',
-	LT: 'Lithuania',
-	LU: 'Luxembourg',
-	MO: 'Macao',
-	MK: 'Macedonia, the Former Yugoslav Republic of',
-	MG: 'Madagascar',
-	MW: 'Malawi',
-	MY: 'Malaysia',
-	MV: 'Maldives',
-	ML: 'Mali',
-	MT: 'Malta',
-	MH: 'Marshall Islands',
-	MQ: 'Martinique',
-	MR: 'Mauritania',
-	MU: 'Mauritius',
-	YT: 'Mayotte',
-	MX: 'Mexico',
-	FM: 'Micronesia, Federated States of',
-	MD: 'Moldova, Republic of',
-	MC: 'Monaco',
-	MN: 'Mongolia',
-	ME: 'Montenegro',
-	MS: 'Montserrat',
-	MA: 'Morocco',
-	MZ: 'Mozambique',
-	MM: 'Myanmar',
-	NA: 'Namibia',
-	NR: 'Nauru',
-	NP: 'Nepal',
-	NL: 'Netherlands',
-	NC: 'New Caledonia',
-	NZ: 'New Zealand',
-	NI: 'Nicaragua',
-	NE: 'Niger',
-	NG: 'Nigeria',
-	NU: 'Niue',
-	NF: 'Norfolk Island',
-	MP: 'Northern Mariana Islands',
-	NO: 'Norway',
-	OM: 'Oman',
-	PK: 'Pakistan',
-	PW: 'Palau',
-	PS: 'Palestine, State of',
-	PA: 'Panama',
-	PG: 'Papua New Guinea',
-	PY: 'Paraguay',
-	PE: 'Peru',
-	PH: 'Philippines',
-	PN: 'Pitcairn',
-	PL: 'Poland',
-	PT: 'Portugal',
-	PR: 'Puerto Rico',
-	QA: 'Qatar',
-	RE: 'R\u00e9union',
-	RO: 'Romania',
-	RU: 'Russian Federation',
-	RW: 'Rwanda',
-	BL: 'Saint Barth\u00e9lemy',
-	SH: 'Saint Helena, Ascension and Tristan da Cunha',
-	KN: 'Saint Kitts and Nevis',
-	LC: 'Saint Lucia',
-	MF: 'Saint Martin (French part)',
-	PM: 'Saint Pierre and Miquelon',
-	VC: 'Saint Vincent and the Grenadines',
-	WS: 'Samoa',
-	SM: 'San Marino',
-	ST: 'Sao Tome and Principe',
-	SA: 'Saudi Arabia',
-	SN: 'Senegal',
-	RS: 'Serbia',
-	SC: 'Seychelles',
-	SL: 'Sierra Leone',
-	SG: 'Singapore',
-	SX: 'Sint Maarten (Dutch part)',
-	SK: 'Slovakia',
-	SI: 'Slovenia',
-	SB: 'Solomon Islands',
-	SO: 'Somalia',
-	ZA: 'South Africa',
-	GS: 'South Georgia and the South Sandwich Islands',
-	SS: 'South Sudan',
-	ES: 'Spain',
-	LK: 'Sri Lanka',
-	SD: 'Sudan',
-	SR: 'Suriname',
-	SJ: 'Svalbard and Jan Mayen',
-	SZ: 'Swaziland',
-	SE: 'Sweden',
-	CH: 'Switzerland',
-	SY: 'Syrian Arab Republic',
-	TW: 'Taiwan, Province of China',
-	TJ: 'Tajikistan',
-	TZ: 'Tanzania, United Republic of',
-	TH: 'Thailand',
-	TL: 'Timor-Leste',
-	TG: 'Togo',
-	TK: 'Tokelau',
-	TO: 'Tonga',
-	TT: 'Trinidad and Tobago',
-	TN: 'Tunisia',
-	TR: 'Turkey',
-	TM: 'Turkmenistan',
-	TC: 'Turks and Caicos Islands',
-	TV: 'Tuvalu',
-	UG: 'Uganda',
-	UA: 'Ukraine',
-	AE: 'United Arab Emirates',
-	GB: 'United Kingdom',
-	US: 'United States',
-	UM: 'United States Minor Outlying Islands',
-	UY: 'Uruguay',
-	UZ: 'Uzbekistan',
-	VU: 'Vanuatu',
-	VE: 'Venezuela, Bolivarian Republic of',
-	VN: 'Viet Nam',
-	VG: 'Virgin Islands, British',
-	VI: 'Virgin Islands, U.S.',
-	WF: 'Wallis and Futuna',
-	EH: 'Western Sahara',
-	YE: 'Yemen',
-	ZM: 'Zambia',
-	ZW: 'Zimbabwe'
-}
-
 export default {
 	isValidURL,
 	convertDuration,
 	convertDurationSeparated,
 	numberWithDots,
-	debounce,
+	debounce
-	COUNTRIES
 }