Refactor to reduce code

SpaceK33z · Dec 14, 2016 · 5554026 · 5554026
1 parent 4d8a377
commit 5554026
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 90 deletions.
diff --git a/src/imdb.js b/src/imdb.js
@@ -39,7 +39,7 @@ function modifyPlexButton(el, action, title, key) {
 		el.classList.add('imdb-to-plex-button--couchpotato');
 		el.addEventListener('click', (e) => {
 			e.preventDefault();
-			addToCouchpotato();
+			addToCouchpotato(config, imdbId);
 		});
 	}
 
@@ -76,48 +76,6 @@ function initPlexThingy() {
 	});
 }
 
-function addToCouchpotato(action) {
-	chrome.runtime.sendMessage({
-		type: 'VIEW_COUCHPOTATO',
-		url: `${config.couchpotatoUrl}/media.get`,
-		imdbId,
-		basicAuth: config.couchpotatoBasicAuth,
-	}, function(res) {
-		const movieExists = res.success;
-		if (res.err) {
-			showNotification('warning', 'CouchPotato request failed (look in DevTools for more info)');
-			console.error('Error with viewing on CouchPotato:', res.err);
-			return;
-		}
-		if (!movieExists) {
-			addToCouchPotatoRequest(imdbId);
-			return;
-		}
-		showNotification('info', `Movie is already in CouchPotato (status: ${res.status})`);
-	});
-}
-
-function addToCouchPotatoRequest(imdbId) {
-	chrome.runtime.sendMessage({
-		type: 'ADD_COUCHPOTATO',
-		url: `${config.couchpotatoUrl}/movie.add`,
-		imdbId,
-		basicAuth: config.couchpotatoBasicAuth,
-	}, function(res) {
-		if (res.err) {
-			showNotification('warning', 'Could not add to CouchPotato (look in DevTools for more info)');
-			console.error('Error with adding on CouchPotato:', err);
-			return;
-		}
-		if (res.success) {
-			showNotification('info', 'Added movie on CouchPotato.');
-		} else {
-			showNotification('warning', 'Could not add to CouchPotato.');
-		}
-	});
-}
-
-
 let config;
 if (isMovie() && imdbId) {
 	getOptions().then((options) => {

diff --git a/src/movieo.js b/src/movieo.js
@@ -105,7 +105,7 @@ function modifyPlexButton(el, action, title, key) {
 		el.classList.add('movieo-to-plex-button--couchpotato');
 		el.addEventListener('click', (e) => {
 			e.preventDefault();
-			addToCouchpotato();
+			addToCouchpotato(config, getImdbId());
 		});
 	}
 
@@ -121,49 +121,3 @@ function getImdbId() {
 	}
 	return null;
 }
-
-function addToCouchpotato(action) {
-	const imdbId = getImdbId();
-	if (!imdbId) {
-		console.log('Cancelled adding to CouchPotato since there is no IMDB ID');
-		return;
-	}
-	chrome.runtime.sendMessage({
-		type: 'VIEW_COUCHPOTATO',
-		url: `${config.couchpotatoUrl}/media.get`,
-		imdbId,
-		basicAuth: config.couchpotatoBasicAuth,
-	}, function(res) {
-		const movieExists = res.success;
-		if (res.err) {
-			showNotification('warning', 'CouchPotato request failed (look in DevTools for more info)');
-			console.error('Error with viewing on CouchPotato:', res.err);
-			return;
-		}
-		if (!movieExists) {
-			addToCouchPotatoRequest(imdbId);
-			return;
-		}
-		showNotification('info', `Movie is already in CouchPotato (status: ${res.status})`);
-	});
-}
-
-function addToCouchPotatoRequest(imdbId) {
-	chrome.runtime.sendMessage({
-		type: 'ADD_COUCHPOTATO',
-		url: `${config.couchpotatoUrl}/movie.add`,
-		imdbId,
-		basicAuth: config.couchpotatoBasicAuth,
-	}, function(res) {
-		if (res.err) {
-			showNotification('warning', 'Could not add to CouchPotato (look in DevTools for more info)');
-			console.error('Error with adding on CouchPotato:', err);
-			return;
-		}
-		if (res.success) {
-			showNotification('info', 'Added movie on CouchPotato.');
-		} else {
-			showNotification('warning', 'Could not add to CouchPotato.');
-		}
-	});
-}
diff --git a/src/utils.js b/src/utils.js
@@ -87,3 +87,48 @@ function showNotification(state, text) {
 		document.body.removeChild(el);
 	}, 5000);
 }
+
+function addToCouchpotato(options, imdbId) {
+	if (!imdbId) {
+		console.log('Cancelled adding to CouchPotato since there is no IMDB ID');
+		return;
+	}
+	chrome.runtime.sendMessage({
+		type: 'VIEW_COUCHPOTATO',
+		url: `${options.couchpotatoUrl}/media.get`,
+		imdbId,
+		basicAuth: options.couchpotatoBasicAuth,
+	}, function(res) {
+		const movieExists = res.success;
+		if (res.err) {
+			showNotification('warning', 'CouchPotato request failed (look in DevTools for more info)');
+			console.error('Error with viewing on CouchPotato:', res.err);
+			return;
+		}
+		if (!movieExists) {
+			addToCouchPotatoRequest(imdbId);
+			return;
+		}
+		showNotification('info', `Movie is already in CouchPotato (status: ${res.status})`);
+	});
+}
+
+function addToCouchPotatoRequest(imdbId) {
+	chrome.runtime.sendMessage({
+		type: 'ADD_COUCHPOTATO',
+		url: `${config.couchpotatoUrl}/movie.add`,
+		imdbId,
+		basicAuth: config.couchpotatoBasicAuth,
+	}, function(res) {
+		if (res.err) {
+			showNotification('warning', 'Could not add to CouchPotato (look in DevTools for more info)');
+			console.error('Error with adding on CouchPotato:', err);
+			return;
+		}
+		if (res.success) {
+			showNotification('info', 'Added movie on CouchPotato.');
+		} else {
+			showNotification('warning', 'Could not add to CouchPotato.');
+		}
+	});
+}