fix: Refactorize exporter

Author: echo724

notion2md/exporter_client.py notion2md/cli.pynotion2md/exporter_client.py renamed to notion2md/cli.py

@@ -4,8 +4,26 @@
 import os
 import sys
 import argparse
+from notion2md.console import print_error
 
-def cli():
+class Config(object):
+    __slots__ = ("file_name", "target_id", "output_path","exporter_type")
+    def __init__(self,args:dict):
+        self.file_name = args["name"] if args["name"] else args["id"]
+
+        self.output_path = os.path.abspath(args["path"]) if args["path"] \
+        else os.path.join(os.getcwd(),'notion2md-output')
+
+        self.target_id = get_id(args["url"]) if args["url"] else args["id"]
+
+        if not self.target_id:
+            print_error("please enter Notion page's id or url")
+            print()
+            sys.exit(1)
+        
+        self.exporter_type = args["type"]
+
+def parse_config() -> dict:
     parser = argparse.ArgumentParser(description="Notion2md: Notion to Markdown Exporter")
     parser.add_argument('--type','-t',type=str,help="Set a type of target page: block, page, database",default="block")
     parser.add_argument('--url','-u',type=str,help="Set an url of target page")
@@ -14,32 +32,26 @@ def cli():
     parser.add_argument('--name','-n',type=str,help="Set a custom name of output file")
     parser.add_argument('--version','-v', action='store_true',help="Show a version of Notion2Md")
 
-    args = parser.parse_args()
-
-    if args.version:
-        print(notion2md.__version__)
-        sys.exit()
-
-    def get_url():
-        return input("Enter Notion Url: ")
-
-    custom_name = args.name if args.name else ""
-
-    target_id = get_id(args.url) if args.url \
-        else ( args.id if args.id \
-        else get_id(get_url()))
-
-    output_path = os.path.abspath(args.path) if args.path \
-        else os.path.join(os.getcwd(),'notion2md-output')
+    return vars(parser.parse_args())
 
+def call_exporter(config:Config):
     target_type_map ={
         'block': block_exporter,
         # 'page': page_exporter,
         # 'database': database
     }
 
-    target_type_map[args.type](target_id,output_path,custom_name)
+    target_type_map[config.exporter_type](config)
+    
+def cli():
+
+    args = parse_config()
 
-    # page_exporter()
+    if args["version"]:
+        print(notion2md.__version__)
+        sys.exit(None)
 
-    # database_exporter()
+    config = Config(args)
+    print()
+    call_exporter(config)
+    print()

notion2md/console.py

@@ -0,0 +1,22 @@
+import os
+
+os.system("")
+
+class Style():
+    BLACK = '\033[30m'
+    RED = '\033[31m'
+    GREEN = '\033[32m'
+    YELLOW = '\033[33m'
+    BLUE = '\033[34m'
+    MAGENTA = '\033[35m'
+    CYAN = '\033[36m'
+    WHITE = '\033[37m'
+    UNDERLINE = '\033[4m'
+    BOLD = '\033[1m'
+    RESET = '\033[0m'
+
+def print_error(message):
+    print(f"{Style.RED}{Style.BOLD}{'ERROR'+' ':>12}{Style.RESET}{message}")
+
+def print_status(status,message):
+    print(f"{Style.GREEN}{Style.BOLD}{status+' ':>12}{Style.RESET}{message}")

notion2md/exporter.py

@@ -1,46 +1,26 @@
-from notion2md.client_handler import notion_client_object
+from notion2md.notion_client import notion_client_object
 from notion2md.convertor.block import blocks_convertor
+from notion2md.cli import Config
 import os
 import time
+from notion2md.console import print_status
 
-os.system("")
-
-class style():
-    BLACK = '\033[30m'
-    RED = '\033[31m'
-    GREEN = '\033[32m'
-    YELLOW = '\033[33m'
-    BLUE = '\033[34m'
-    MAGENTA = '\033[35m'
-    CYAN = '\033[36m'
-    WHITE = '\033[37m'
-    UNDERLINE = '\033[4m'
-    BOLD = '\033[1m'
-    UNDERLINE = '\033[4m'
-    RESET = '\033[0m'
-
-def fprint(left,right):
-    print(f"{style.GREEN}{style.BOLD}{left+' ':>12}{style.RESET}{right}")
-
-def block_exporter(target_id:str,output_path="notion2md-output",custom_name=""):
+def block_exporter(config:Config):
     start_time = time.time()
     #Directory Checking and Creating
-    if not os.path.exists(output_path):
-        os.mkdir(output_path)
-    #Get title from parent page block
-    block_title = custom_name if custom_name \
-        else target_id
+    if not os.path.exists(config.output_path):
+        os.mkdir(config.output_path)
     #Get actual blocks
-    print()
-    fprint("Retrieving",f"blocks from '{target_id}'")
-    blocks = notion_client_object.blocks.children.list(target_id)['results']
+
+    print_status("Retrieving",f"blocks from '{config.target_id}'")
+    blocks = notion_client_object.blocks.children.list(config.target_id)['results']
     #Write(Export) Markdown file
-    with open(os.path.join(output_path,block_title+'.md'),'w',encoding="utf-8") as output:
+    with open(os.path.join(config.output_path,config.file_name + '.md'),'w',encoding="utf-8") as output:
         output.write(blocks_convertor(blocks))
+        
     #Result and Time Check
-    fprint("Converted", f"{str(len(blocks))} blocks to markdown in {time.time() - start_time:.2f}s")
-    fprint("Exported", f'"{block_title}.md" in "{os.path.abspath(output_path)}/"')
-    print()
+    print_status("Converted", f"{str(len(blocks))} blocks to markdown in {time.time() - start_time:.2f}s")
+    print_status("Exported", f'"{config.file_name}.md" in "{os.path.abspath(config.output_path)}/"')
 
 # page_exporter()
 

notion2md/client_handler.py notion2md/notion_client.pynotion2md/client_handler.py renamed to notion2md/notion_client.py

@@ -1,13 +1,14 @@
 from notion_client import Client #,AsyncClient
 import os,sys
+from notion2md.console import print_error
 
 try:
     notion_client_object = Client(auth=os.environ["NOTION_TOKEN"])
 except:
+    print_error("Notion Integration Token is not found")
+    print()
     print(
     """
-        Token Error
-
         Welcome to notion2md!
 
         To get started, you need to save your Notion Integration Token.
@@ -23,5 +24,5 @@
         put upper command in your shell resource(ex: .bashrc or .zshrc)
     """
     )
-    sys.exit()
+    sys.exit(1)
 # notion_async_client = AsyncClient(auth=os.environ["NOTION_TOKEN"])