Skip to content

Commit

Permalink
Merge pull request #6 from Danjar27/VER-1.5.4/connect-to-flask
Browse files Browse the repository at this point in the history
Ver 1.5.4
  • Loading branch information
Danjar27 authored Apr 16, 2022
2 parents 21f560d + 7a02551 commit 7c07154
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions MANIFEST
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# file GENERATED by distutils, do NOT edit
setup.cfg
setup.py
getBCE\lector.py
getBCE\menu.py
getBCE\utils.py
getBCE\Main.py
getBCE\Reader.py
getBCE\Utils.py
5 changes: 3 additions & 2 deletions getBCE/Main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@ def __init__(self) -> None:
self.__date_reader = Reader(self.__main, False)
self.__page_menu: dict = {}

def set_date(self, year: str, month: str, **options) -> None:
def set_date(self, year: str, month: str, **options) -> dict:
try:
first_href, first_date = destructure(self.__date_reader.result)
menu = date_and_href_to_menu(first_href, first_date)
self.__date_page_href = get_href_from_menu(menu, year, month).replace(' ', '').replace('\n', ' ')
link_reader = Reader(self.__date_page_href, True)
second_href, second_date = destructure(link_reader.result)
menu = date_and_href_to_page_menu(second_href, second_date)
index_filter(
filters = index_filter(
second_date,
options['starts_at'] if 'starts_at' in options else 0,
options['number_of_elements'] if 'number_of_elements' in options else 5,
options['show'] if 'show' in options else True
)
self.__page_menu = menu
return selector(menu, filters)
except AttributeError:
print(AttributeError)

Expand Down
25 changes: 16 additions & 9 deletions getBCE/Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ def set_bounders(any_list: list, bounder: int) -> List[str]:


def capitalize(phrase: str) -> str:
separated = phrase.replace(chr(10), ' ').replace(chr(13), ' ').split(' ')
separated = phrase \
.strip() \
.replace(chr(10), '') \
.replace(chr(13), '') \
.split(' ')
corrected = []
for element in separated:
if element:
Expand Down Expand Up @@ -87,17 +91,20 @@ def create_index_for_list(raw_list: list) -> list:
return ['{0:03}'.format(index) for index, _ in enumerate(raw_list)]


def selector(menu: dict, index_selector: List[int]) -> list:
return [menu[z][1] for z in index_selector]
def selector(menu: dict, index_selector: list) -> dict:
return {key: menu[key] for key in index_selector}


def index_filter(date: list, starts_at: int = 0, number_of_elements: int = 5, show=True) -> None:
if show:
index = create_index_for_list(date)
rango = number_of_elements if number_of_elements < len(index) else len(index)
for element in range(rango):
date_inline = capitalize(date[element + starts_at])
def index_filter(date: list, starts_at: int = 0, number_of_elements: int = 5, show=True) -> list:
filters = []
index = create_index_for_list(date)
rango = number_of_elements if number_of_elements < len(index) else len(index)
for element in range(rango):
date_inline = capitalize(date[int(element) + starts_at])
filters.append(index[element + starts_at])
if show:
print(f'[{index[element + starts_at]}] | {date_inline}')
return filters


def date_and_href_to_page_menu(href: list, date: list) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
setup(
name='getBCE',
packages=['getBCE'],
version="1.5.3.5",
version="1.5.4",
description='Download data from BCE (Banco Central del ecuador) webpage',
author='S. Daniel Jaramillo',
author_email='[email protected]',
Expand Down

0 comments on commit 7c07154

Please sign in to comment.