diff --git a/couchpotato/core/providers/nzb/moovee/__init__.py b/couchpotato/core/providers/nzb/moovee/__init__.py
deleted file mode 100644
index f2f85d18..00000000
--- a/couchpotato/core/providers/nzb/moovee/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from .main import Moovee
-
-def start():
- return Moovee()
-
-config = [{
- 'name': 'moovee',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'name': '#alt.binaries.moovee',
- 'description': 'SD movies only',
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/moovee/main.py b/couchpotato/core/providers/nzb/moovee/main.py
deleted file mode 100644
index 65f118d7..00000000
--- a/couchpotato/core/providers/nzb/moovee/main.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from dateutil.parser import parse
-import re
-import time
-
-log = CPLog(__name__)
-
-
-class Moovee(NZBProvider):
-
- urls = {
- 'download': 'http://85.214.105.230/get_nzb.php?id=%s§ion=moovee',
- 'search': 'http://abmoovee.allfilled.com/search.php?q=%s&Search=Search',
- }
-
- regex = '
(?P.*?) | .+?(?P.*?) | .+?(?P.*?) | '
-
- http_time_between_calls = 2 # Seconds
-
- def search(self, movie, quality):
-
- results = []
- if self.isDisabled() or not self.isAvailable(self.urls['search']) or quality.get('hd', False):
- return results
-
- q = '%s %s' % (getTitle(movie['library']), quality.get('identifier'))
- url = self.urls['search'] % tryUrlencode(q)
-
- cache_key = 'moovee.%s' % q
- data = self.getCache(cache_key, url)
- if data:
- match = re.compile(self.regex, re.DOTALL).finditer(data)
-
- for nzb in match:
- new = {
- 'id': nzb.group('reqid'),
- 'name': nzb.group('title'),
- 'type': 'nzb',
- 'provider': self.getName(),
- 'age': self.calculateAge(time.mktime(parse(nzb.group('age')).timetuple())),
- 'size': None,
- 'url': self.urls['download'] % (nzb.group('reqid')),
- 'detail_url': '',
- 'description': '',
- 'check_nzb': False,
- }
-
- new['score'] = fireEvent('score.calculate', new, movie, single = True)
- is_correct_movie = fireEvent('searcher.correct_movie',
- nzb = new, movie = movie, quality = quality,
- imdb_results = False, single_category = False, single = True)
- if is_correct_movie:
- results.append(new)
- self.found(new)
-
- return results
-
- def belongsTo(self, url, host = None):
- match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*§ion=moovee', url)
- if match:
- return self
- return
diff --git a/couchpotato/core/providers/nzb/x264/__init__.py b/couchpotato/core/providers/nzb/x264/__init__.py
deleted file mode 100644
index 152be009..00000000
--- a/couchpotato/core/providers/nzb/x264/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from .main import X264
-
-def start():
- return X264()
-
-config = [{
- 'name': 'x264',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'name': '#alt.binaries.hdtv.x264',
- 'description': 'HD movies only',
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/x264/main.py b/couchpotato/core/providers/nzb/x264/main.py
deleted file mode 100644
index 4292dee5..00000000
--- a/couchpotato/core/providers/nzb/x264/main.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-import re
-
-log = CPLog(__name__)
-
-
-class X264(NZBProvider):
-
- urls = {
- 'download': 'http://85.214.105.230/get_nzb.php?id=%s§ion=hd',
- 'search': 'http://85.214.105.230/x264/requests.php?release=%s&status=FILLED&age=1300&sort=ID',
- }
-
- regex = '| (?P.*?) | (?P.*?) | .+?(?P.*?) | '
-
- http_time_between_calls = 2 # Seconds
-
- def search(self, movie, quality):
-
- results = []
- if self.isDisabled() or not self.isAvailable(self.urls['search'].split('requests')[0]) or not quality.get('hd', False):
- return results
-
- q = '%s %s %s' % (getTitle(movie['library']), movie['library']['year'], quality.get('identifier'))
- url = self.urls['search'] % tryUrlencode(q)
-
- cache_key = 'x264.%s.%s' % (movie['library']['identifier'], quality.get('identifier'))
- data = self.getCache(cache_key, url)
- if data:
- match = re.compile(self.regex, re.DOTALL).finditer(data)
-
- for nzb in match:
- try:
- age_match = re.match('((?P\d+)d)', nzb.group('age'))
- age = age_match.group('day')
- except:
- age = 1
-
- new = {
- 'id': nzb.group('id'),
- 'name': nzb.group('title'),
- 'type': 'nzb',
- 'provider': self.getName(),
- 'age': tryInt(age),
- 'size': None,
- 'url': self.urls['download'] % (nzb.group('id')),
- 'detail_url': '',
- 'description': '',
- 'check_nzb': False,
- }
-
- new['score'] = fireEvent('score.calculate', new, movie, single = True)
- is_correct_movie = fireEvent('searcher.correct_movie',
- nzb = new, movie = movie, quality = quality,
- imdb_results = False, single_category = False, single = True)
- if is_correct_movie:
- results.append(new)
- self.found(new)
-
- return results
-
- def belongsTo(self, url, host = None):
- match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*§ion=hd', url)
- if match:
- return self
- return