Skip to content

Small feature: Service Matcher on Embed.ly Client #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
umbrae wants to merge 3 commits into from
Closed

Small feature: Service Matcher on Embed.ly Client #2

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e632e8f
Added a service matcher to the python client - allows you to determin…
umbrae Jun 15, 2011
659d6a4
Merge remote-tracking branch 'fork-origin/master'
umbrae Nov 22, 2011
8d93b5b
Updated to match new version of the library.
umbrae Nov 22, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'fork-origin/master' 
Conflicts:
	embedly/client.py
  • Loading branch information
@umbrae
umbrae committed Nov 22, 2011
commit 659d6a4bef3873eec86f83b56db2cc7aa6fa2ff6
24 changes: 7 additions & 17 deletions embedly/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ def get_services(self):
resp_data = json.loads(content)
self.services = resp_data

#build the regex that we can use later.
_regex = []
for each in self.get_services():
_regex.append('|'.join(each.get('regex',[])))

self._regex = re.compile('|'.join(_regex))

return self.services

def service_matcher(self):
Expand All @@ -76,23 +83,6 @@ def url_is_serviced(self, url):
"""
return self.service_matcher().match(url) is not None

def _get(self, version, method, url_or_urls, **kwargs):
"""
_get makes the actual call to pro.embed.ly/api.embed.ly
"""

query = ''

if self.key:

_regex = []
for each in self.get_services():
_regex.append('|'.join(each.get('regex',[])))

self._regex = re.compile('|'.join(_regex))

return self.services

@property
def regex(self):
"""
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.