Crinibus · Crinibus · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,5 @@
+[flake8]
+max-complexity = 10
+max-line-length = 127
+exclude = .git,__pycache__
+per-file-ignores = __init__.py:F401
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 
 __pycache__/
-.vscode/
+.vscode/
+api_cache/
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Crinibus
+Copyright (c) 2022 Crinibus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -7,19 +7,23 @@ A program that gives the user a list over what comes in tv*.
 <br/>
 
 
+Requires ```python3.9+```
+
+<br/>
+
 # How to use <a name="how-to-use"></a>
 
 An example on how to use this program:
 ```
-python3 main.py -c dr1 -c tv2 --all
+python3 main.py -c dr1 tv2 --all
 ```
 This prints all the programs that run today for the channels DR1 and TV2.
 
 <br/>
 
 Another example:
 ```
-python3 main.py -c dr1 -c tv2 -t 20:00 -d 1
+python3 main.py -c dr1 tv2 -t 20:00 -d 1
 ```
 This prints only the tv-shows that start or is running at 8 pm the next day on the channels DR1 and TV2.
 
@@ -45,29 +49,30 @@ This prints the programs (with categories) that is currently running on the defa
 - ```-v``` or ```--verbose```
 - ```-s [search-term]``` or ```--search [search-term]```
 - ```--default-channels [channel]```
-- ```--default-space-seperator [space-seperator]```
 - ```--justify-length [int]```
 
 <br/>
 
 
 ## --channel <a name="--channel"></a>
 
-By using the flag ```-c``` or ```--channel``` you specify which channels you want the program to show tv-shows from. Replace "[channel]" with wanted channel, e.g. "dr1". <br/>
-You can specify multiple channels just by using the ```-c``` flag again.<br/>
+By using the flag ```-c``` or ```--channel``` you specify which channels you want the program to show tv-shows from. Replace "[channel]" with wanted channel(s), e.g. "dr1". <br/>
 If no channel(s) is chosen, the default channels is used. You can change the default channels as described [here](#--default-channels)
 
 For example:
 ```
 python3 main.py -c [channel_1] -c [channel_2]
 ```
-**OBS**: when specifing channels with a space such as "TV2 News", use a dash (-) instead of a space. E.g. "TV2 News" -> "TV2-News"
+or
+```
+python3 main.py -c [channel_1] [channel_2]
+```
 
 You can also specify "all" as the first channel to get all channels.
 
 Examples:<br/>
 ```
-python3 main.py -c dr1 -c tv2 --all
+python3 main.py -c dr1 tv2 --all
 ```
 This shows all the programs that run on DR1 and TV2 for today.
 
@@ -135,7 +140,7 @@ This shows all the programs that have the category "film" on the default channel
 <br/>
 
 ```
-python3 main.py --category film --category drama
+python3 main.py --category film drama
 ```
 This shows all the programs that have either the category "film" or "drama" on the default channels for today.
 
@@ -178,7 +183,7 @@ This shows all the programs on the default channels for today that have the word
 <br/>
 
 ```
-python3 main.py --search avis --search vejr
+python3 main.py --search avis vejr
 ```
 This shows all the programs on the default channels for today that have either the words "avis" or "vejr" in the title.
 
@@ -197,18 +202,6 @@ This changes the default channels to "DR1", "TV2" and "CANAL 9".
 <br/>
 
 
-## --default-space-seperator <a name="--default-space-seperator"></a>
-
-
-Example:
-```
-python3 main.py --default-space-seperator -
-```
-This changes the default space seperator to the sign "-".
-
-<br/>
-
-
 ## --justify-length <a name="--justify-length"></a>
 
 

diff --git a/main.py b/main.py
@@ -1,106 +1,22 @@
-# from format import Format
-# from argument import argparse_setup
-# from API import API
-# from Config import Config
 import tvguide as tv
 
 
-def print_currently_running(data_source: dict, user_channels: list) -> None:
-    channels_string = ", ".join(user_channels).upper()
-
-    print(f"\n----- Showing currently running programs for: {channels_string} -----", end="")
-    for channel in user_channels:
-        data_source[channel].print_currently_running()
-
-
-def print_program_times(data_source: dict, user_channels: list, user_times: list) -> None:
-    channels_string = ", ".join(user_channels).upper()
-    user_times_string = ", ".join(user_times)
-
-    print(f"\n----- Showing programs that is running at: {user_times_string} for: {channels_string} -----", end="")
-    for channel in user_channels:
-        data_source[channel].print_times(user_times)
-
-
-def print_program_categories(data_source: dict, user_channels: list, user_categories: list) -> None:
-    user_categories_string = ", ".join(user_categories)
-
-    print(f"\n----- Searching for categories: {user_categories_string} -----", end="")
-    for channel in user_channels:
-        data_source[channel].print_categories(user_categories)
-
-
-def print_program_searches(data_source: dict, user_channels: list, user_searches: list) -> None:
-    user_search_string = tv.Format.user_search(", ".join(user_searches))
-
-    print(f"\n----- Searching for keywords: {user_search_string} -----", end="")
-    for channel in user_channels:
-        data_source[channel].print_searches(user_searches)
-
-
-def print_program_all(data_source: dict, user_channels: list) -> None:
-    user_channels_string = ", ".join(user_channels).upper()
-
-    print(f"\n----- Showing all programs for: {user_channels_string} -----", end="")
-    for channel in user_channels:
-        data_source[channel].print_all_programs()
-
-
-def change_defaults(args, data: dict):
-    if args.default_channels:
-        tv.Config.change_defaults_user_channels(args.default_channels)
-        default_channels_string = ", ".join(args.default_channels).upper()
-        print(f"Changed default channel(s) to: {default_channels_string}")
-
-    if args.default_space_seperator:
-        tv.Config.change_space_seperator(args.default_space_seperator)
-        print(f"Changed space seperator to: {args.default_space_seperator}")
-
-    if args.justify_length:
-        tv.Config.change_justify_length(args.justify_length)
-        print(f"Changed justify length to: {args.justify_length}")
-
-    if not args.channel:
-        args.channel = tv.Config.get_defaults_user_channels()
-        default_channels_string = ", ".join(args.channel).upper()
-        print(f"No channel(s) chosen: using default channels ({default_channels_string})")
-    elif args.channel[0].lower() == "all":
-        args.channel = [channel for channel in data.keys()]
-
-
-def print_programs(args, data):
-    if args.now:
-        print_currently_running(data, args.channel)
-
-    if args.time:
-        print_program_times(data, args.channel, args.time)
-
-    if args.category:
-        print_program_categories(data, args.channel, args.category)
-
-    if args.search:
-        print_program_searches(data, args.channel, args.search)
-
-    if args.all:
-        print_program_all(data, args.channel)
-
-
 def main():
     args = tv.argparse_setup()
 
-    api_data = tv.API.get_data(args.day)
+    tvguide = tv.TvGuide()
+
+    tvguide.parse_arguments(args)
 
-    my_data = tv.API.format_data(api_data, args.verbose)
+    api_data = tv.ApiManager.get_data(tvguide.relative_date)
 
-    change_defaults(args, my_data)
+    tvguide.parse_api_data(api_data)
 
-    print_programs(args, my_data)
+    tvguide.print_programs()
 
 
 if __name__ == "__main__":
     try:
         main()
-    except KeyError:
-        print("Check channel name or this scraper can't use this channel")
     except KeyboardInterrupt:
         print("Stopped by user")
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 127
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
-requests==2.24.0
+requests>=2.24.0
+requests-cache>=0.9.6
diff --git a/tvguide/API.py b/tvguide/API.py
diff --git a/tvguide/Config.py b/tvguide/Config.py
diff --git a/tvguide/__init__.py b/tvguide/__init__.py
@@ -1,4 +1,5 @@
 from .format import Format
 from .argument import argparse_setup
-from .API import API
-from .Config import Config
+from .api import ApiManager
+from .config import ConfigManager
+from .tvguide import TvGuide
diff --git a/tvguide/api.py b/tvguide/api.py
@@ -0,0 +1,23 @@
+import requests
+import requests_cache
+
+from tvguide.const import API_LINK, REQUEST_HEADER, REQUEST_COOKIES
+from tvguide.format import Format
+from tvguide.tv import Channel
+
+requests_cache.install_cache(cache_name="api_cache", expire_after=120, backend="filesystem")
+
+
+class ApiManager:
+    @staticmethod
+    def get_link(relative_date: int) -> str:
+        date = Format.get_specified_date(relative_date)
+        return API_LINK.replace("{date}", date)
+
+    @staticmethod
+    def get_data(relative_day: int) -> dict:
+        """Get formatted data from API"""
+        api_link = ApiManager.get_link(relative_day)
+        response = requests.get(api_link, headers=REQUEST_HEADER, cookies=REQUEST_COOKIES)
+
+        return response.json()