forked from cloudflare-api/python-cloudflare-v4
-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added Content-Type processing on add, removed old api web checking (h…
…ence remove bs4), refactoring of all add methods, network now handles data/json cleanly, results returned based on Content-Type via new code, setup/requirements removed BeautifulSoup/bs4
- Loading branch information
Showing
8 changed files
with
382 additions
and
459 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,105 @@ | ||
| """ API extras for Cloudflare API""" | ||
|
|
||
| import sys | ||
| import datetime | ||
| # TODO - remove at some point | ||
|
|
||
| API_TYPES = ['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] | ||
|
|
||
| class mybs4(): | ||
| """ mybs4 """ | ||
|
|
||
| _BeautifulSoup = None | ||
| _Comment = None | ||
|
|
||
| def __init__(self): | ||
| """ __init__ """ | ||
| pass | ||
|
|
||
| def _available(self): | ||
| """ _available() """ | ||
| if not mybs4._BeautifulSoup: | ||
| try: | ||
| from bs4 import BeautifulSoup, Comment | ||
| mybs4._BeautifulSoup = BeautifulSoup | ||
| mybs4._Comment = Comment | ||
| self.Comment = mybs4._Comment | ||
| except ImportError: | ||
| return False | ||
| return True | ||
|
|
||
| def BeautifulSoup(self, content, parser): | ||
| """ BeautifulSoup() """ | ||
| self._available() | ||
| return mybs4._BeautifulSoup(content, parser) | ||
|
|
||
| my_bs4 = mybs4() | ||
|
|
||
| def do_section(section): | ||
| """ API extras for Cloudflare API""" | ||
|
|
||
| cmds = [] | ||
| # look for deprecated first in section | ||
| deprecated = False | ||
| deprecated_date = '' | ||
| deprecated_already = False | ||
| for tag2 in section.find_all('h3'): | ||
| # <h3 class="text-warning" data-reactid="13490">Deprecation Warning</h3> | ||
| if 'Deprecation Warning' in str(tag2): | ||
| deprecated = True | ||
| break | ||
| for tag2 in section.find_all('p'): | ||
| # <p class="deprecation-date" data-reactid="13491">End of life Date: November 2, 2020</p> | ||
| if 'End of life Date:' in str(tag2): | ||
| for child in tag2.children: | ||
| deprecated_date = str(child).replace('End of life Date:','').strip() | ||
| try: | ||
| # clean up date | ||
| d = datetime.datetime.strptime(deprecated_date, '%B %d, %Y') | ||
| if d <= datetime.datetime.now(): | ||
| # already done! | ||
| deprecated_already = True | ||
| deprecated_date = d.strftime('%Y-%m-%d') | ||
| except ValueError: | ||
| # Lets not worry about all the date formats that could show-up. Leave as a string | ||
| pass | ||
| break | ||
| if deprecated_date != '': | ||
| break | ||
| # look for all API calls in section | ||
| for tag2 in section.find_all('pre'): | ||
| cmd = [] | ||
| for child in tag2.children: | ||
| if isinstance(child, my_bs4.Comment): | ||
| # remove <!-- react-text ... -> parts | ||
| continue | ||
| cmd.append(str(child).strip()) | ||
| if len(cmd) == 0: | ||
| continue | ||
| action = cmd[0] | ||
| if action == '' or action not in API_TYPES: | ||
| continue | ||
| cmd = ''.join(cmd[1:]) | ||
| if cmd[0] != '/': | ||
| cmd = '/' + cmd | ||
| v = {'action': action, 'cmd': cmd, 'deprecated': deprecated, 'deprecated_date': deprecated_date, 'deprecated_already': deprecated_already} | ||
| cmds.append(v) | ||
| return cmds | ||
|
|
||
| def api_decode_from_web(content): | ||
| """ API extras for Cloudflare API""" | ||
|
|
||
| soup = my_bs4.BeautifulSoup(content, 'html.parser') | ||
|
|
||
| for child in soup.find_all('p'): | ||
| t = child.get_text() | ||
| if 'Last modified' in t: | ||
| sys.stderr.write("Retrieved API: %s\n" % (t.strip().replace('\n', ' '))) | ||
| break | ||
|
|
||
| all_cmds = [] | ||
| for section in soup.find_all('section'): | ||
| all_cmds += do_section(section) | ||
|
|
||
| return sorted(all_cmds, key=lambda v: v['cmd']) | ||
| #import sys | ||
| #import datetime | ||
| # | ||
| #API_TYPES = ['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] | ||
| # | ||
| #class mybs4(): | ||
| # """ mybs4 """ | ||
| # | ||
| # _BeautifulSoup = None | ||
| # _Comment = None | ||
| # | ||
| # def __init__(self): | ||
| # """ __init__ """ | ||
| # pass | ||
| # | ||
| # def _available(self): | ||
| # """ _available() """ | ||
| # if not mybs4._BeautifulSoup: | ||
| # try: | ||
| # from bs4 import BeautifulSoup, Comment | ||
| # mybs4._BeautifulSoup = BeautifulSoup | ||
| # mybs4._Comment = Comment | ||
| # self.Comment = mybs4._Comment | ||
| # except ImportError: | ||
| # return False | ||
| # return True | ||
| # | ||
| # def BeautifulSoup(self, content, parser): | ||
| # """ BeautifulSoup() """ | ||
| # self._available() | ||
| # return mybs4._BeautifulSoup(content, parser) | ||
| # | ||
| #my_bs4 = mybs4() | ||
| # | ||
| #def do_section(section): | ||
| # """ API extras for Cloudflare API""" | ||
| # | ||
| # cmds = [] | ||
| # # look for deprecated first in section | ||
| # deprecated = False | ||
| # deprecated_date = '' | ||
| # deprecated_already = False | ||
| # for tag2 in section.find_all('h3'): | ||
| # # <h3 class="text-warning" data-reactid="13490">Deprecation Warning</h3> | ||
| # if 'Deprecation Warning' in str(tag2): | ||
| # deprecated = True | ||
| # break | ||
| # for tag2 in section.find_all('p'): | ||
| # # <p class="deprecation-date" data-reactid="13491">End of life Date: November 2, 2020</p> | ||
| # if 'End of life Date:' in str(tag2): | ||
| # for child in tag2.children: | ||
| # deprecated_date = str(child).replace('End of life Date:','').strip() | ||
| # try: | ||
| # # clean up date | ||
| # d = datetime.datetime.strptime(deprecated_date, '%B %d, %Y') | ||
| # if d <= datetime.datetime.now(): | ||
| # # already done! | ||
| # deprecated_already = True | ||
| # deprecated_date = d.strftime('%Y-%m-%d') | ||
| # except ValueError: | ||
| # # Lets not worry about all the date formats that could show-up. Leave as a string | ||
| # pass | ||
| # break | ||
| # if deprecated_date != '': | ||
| # break | ||
| # # look for all API calls in section | ||
| # for tag2 in section.find_all('pre'): | ||
| # cmd = [] | ||
| # for child in tag2.children: | ||
| # if isinstance(child, my_bs4.Comment): | ||
| # # remove <!-- react-text ... -> parts | ||
| # continue | ||
| # cmd.append(str(child).strip()) | ||
| # if len(cmd) == 0: | ||
| # continue | ||
| # action = cmd[0] | ||
| # if action == '' or action not in API_TYPES: | ||
| # continue | ||
| # cmd = ''.join(cmd[1:]) | ||
| # if cmd[0] != '/': | ||
| # cmd = '/' + cmd | ||
| # v = {'action': action, 'cmd': cmd, 'deprecated': deprecated, 'deprecated_date': deprecated_date, 'deprecated_already': deprecated_already} | ||
| # cmds.append(v) | ||
| # return cmds | ||
| # | ||
| #def api_decode_from_web(content): | ||
| # """ API extras for Cloudflare API""" | ||
| # | ||
| # soup = my_bs4.BeautifulSoup(content, 'html.parser') | ||
| # | ||
| # for child in soup.find_all('p'): | ||
| # t = child.get_text() | ||
| # if 'Last modified' in t: | ||
| # sys.stderr.write("Retrieved API: %s\n" % (t.strip().replace('\n', ' '))) | ||
| # break | ||
| # | ||
| # all_cmds = [] | ||
| # for section in soup.find_all('section'): | ||
| # all_cmds += do_section(section) | ||
| # | ||
| # return sorted(all_cmds, key=lambda v: v['cmd']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.