* split pushover and myepisodes code

website/scripts/lib/scraper.groovy

@@ -0,0 +1,79 @@
+/****************************************************************************
+ * MyEpisodes
+ * 				http://www.myepisodes.com
+ ****************************************************************************/
+@Grab(group='org.jsoup', module='jsoup', version='1.7.1')
+import org.jsoup.Jsoup
+import org.jsoup.Connection.Method
+import net.sourceforge.filebot.Cache
+
+def MyEpisodes(username, password) {
+	return new MyEpisodesScraper(username:username, password:password)
+}
+
+class MyEpisodesScraper {
+	def username
+	def password
+	
+	def cache = Cache.getCache('web-datasource-lv2')
+	def session = [:]
+	
+	def login = {
+		def response = Jsoup.connect('http://www.myepisodes.com/login.php').data('username', username, 'password', password, 'action', 'Login', 'u', '').method(Method.POST).execute()
+		session << response.cookies()
+		return response.parse()
+	}
+	
+	def get = { url ->
+		if (session.isEmpty()) {
+			login()
+		}
+		
+		def response = Jsoup.connect(url).cookies(session).method(Method.GET).execute()
+		session << response.cookies()
+		def html = response.parse()
+		
+		if (html.select('#frmLogin')) {
+			session.clear()
+			throw new Exception('Login failed')
+		}
+		
+		return html
+	}
+	
+	def getShows = {
+		def shows = cache.get('MyEpisodes.Shows')
+		if (shows == null) {
+			shows = ['other', 'A'..'Z'].flatten().findResults{ section ->
+				get("http://myepisodes.com/shows.php?list=${section}").select('a').findResults{ a ->
+					try {
+						return [id:a.absUrl('href').match(/showid=(\d+)/).toInteger(), name:a.text().trim()]
+					} catch(e) {
+						return null
+					}
+				}
+			}.flatten().sort{ it.name }
+			cache.put('MyEpisodes.Shows', shows)
+		}
+		return shows
+	}
+	
+	def getShowList = {
+		get("http://www.myepisodes.com/shows.php?type=manage").select('option').findResults{ option ->
+			try {
+				return [id:option.attr('value').toInteger(), name:option.text().trim()]
+			} catch(e) {
+				return null
+			}
+		}
+	}
+	
+	def addShow = { showid ->
+		get("http://www.myepisodes.com/views.php?type=manageshow&mode=add&showid=${showid}")
+	}
+	
+	def update = { showid, season, episode, tick = 'acquired', value = '1' ->
+		get("http://www.myepisodes.com/myshows.php?action=Update&showid=${showid}&season=${season}&episode=${episode}&${tick}=${value}")
+	}
+	
+}

website/scripts/lib/ws.groovy

@@ -20,86 +20,3 @@ class PushoverClient {
 		endpoint.post(parameters).text.xml
 	}
 }
-
-
-
-
-/****************************************************************************
- * MyEpisodes
- * 				http://www.myepisodes.com
- ****************************************************************************/
-@Grab(group='org.jsoup', module='jsoup', version='1.7.1')
-import org.jsoup.Jsoup
-import org.jsoup.Connection.Method
-import net.sourceforge.filebot.Cache
-
-def MyEpisodes(username, password) {
-	return new MyEpisodesScraper(username:username, password:password)
-}
-
-class MyEpisodesScraper {
-	def username
-	def password
-	
-	def cache = Cache.getCache('web-datasource-lv2')
-	def session = [:]
-	
-	def login = {
-		def response = Jsoup.connect('http://www.myepisodes.com/login.php').data('username', username, 'password', password, 'action', 'Login', 'u', '').method(Method.POST).execute()
-		session << response.cookies()
-		return response.parse()
-	}
-	
-	def get = { url ->
-		if (session.isEmpty()) {
-			login()
-		}
-		
-		def response = Jsoup.connect(url).cookies(session).method(Method.GET).execute()
-		session << response.cookies()
-		def html = response.parse()
-		
-		if (html.select('#frmLogin')) {
-			session.clear()
-			throw new Exception('Login failed')
-		}
-		
-		return html
-	}
-	
-	def getShows = {
-		def shows = cache.get('MyEpisodes.Shows')
-		if (shows == null) {
-			shows = ['other', 'A'..'Z'].flatten().findResults{ section ->
-				get("http://myepisodes.com/shows.php?list=${section}").select('a').findResults{ a ->
-					try {
-						return [id:a.absUrl('href').match(/showid=(\d+)/).toInteger(), name:a.text().trim()]
-					} catch(e) {
-						return null
-					}
-				}
-			}.flatten().sort{ it.name }
-			cache.put('MyEpisodes.Shows', shows)
-		}
-		return shows
-	}
-	
-	def getShowList = {
-		get("http://www.myepisodes.com/shows.php?type=manage").select('option').findResults{ option ->
-			try {
-				return [id:option.attr('value').toInteger(), name:option.text().trim()]
-			} catch(e) {
-				return null
-			}
-		}
-	}
-	
-	def addShow = { showid ->
-		get("http://www.myepisodes.com/views.php?type=manageshow&mode=add&showid=${showid}")
-	}
-	
-	def update = { showid, season, episode, tick = 'acquired', value = '1' ->
-		get("http://www.myepisodes.com/myshows.php?action=Update&showid=${showid}&season=${season}&episode=${episode}&${tick}=${value}")
-	}
-	
-}

website/scripts/update-mes.groovy

@@ -6,7 +6,7 @@ def mesupdate = tryQuietly { tick } ?: 'acquired'
 def mesvalue = tryQuietly { value } ?: '1'
 
 // import myepisodes scraper
-include('fn:lib/ws')
+include('fn:lib/scraper')
 
 def mes = MyEpisodes(mesacc[0], mesacc[1])
 def myshows = mes.getShowList()