From b984bb2ad53fd574198fd05403f1b9b397521910 Mon Sep 17 00:00:00 2001 From: Daniel Jaramillo Date: Sat, 16 Apr 2022 12:14:25 -0500 Subject: [PATCH 1/2] last functional version --- MANIFEST | 6 +++--- getBCE/Main.py | 5 +++-- getBCE/Utils.py | 25 ++++++++++++++++--------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/MANIFEST b/MANIFEST index 5d84166..4cbd59b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -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 diff --git a/getBCE/Main.py b/getBCE/Main.py index 27a8316..81282f3 100644 --- a/getBCE/Main.py +++ b/getBCE/Main.py @@ -10,7 +10,7 @@ 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) @@ -18,13 +18,14 @@ def set_date(self, year: str, month: str, **options) -> None: 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) diff --git a/getBCE/Utils.py b/getBCE/Utils.py index b6af2ef..49a0f04 100644 --- a/getBCE/Utils.py +++ b/getBCE/Utils.py @@ -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: @@ -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: From 7a02551aac1c44d1d2b4887d7e24c93d82301228 Mon Sep 17 00:00:00 2001 From: Daniel Jaramillo Date: Sat, 16 Apr 2022 12:15:47 -0500 Subject: [PATCH 2/2] new version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9b42248..16999a6 100644 --- a/setup.py +++ b/setup.py @@ -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='losteven2018@outlook.com',