feat: add options to select which dataset to be processed

Author: yuukidach

docs/res/web.png

@@ -69,10 +69,16 @@ def collect(dir: str, timestamp: bool, num: int, stream: int, extra: bool,
               is_flag=True,
               default=False,
               help='Run in debug mode.')
-def process(debug: bool):
+@click.option('--dir', '-d', 
+              default='dataset',
+              help='Data directory.')
+@click.option('--timestamp', '-t',
+              default=None,
+              help='Data timestamp.')
+def process(debug: bool, dir: str, timestamp: str):
     """ Process data and do visualization.
     """
-    show(debug)
+    show(debug, dir, timestamp)
 
 
 cli.add_command(save_user)

src/twitchanal/cli.py

@@ -11,13 +11,14 @@
 
 app = dash.Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 
-game = Game()
-df = game.get_data()
-tags = game.get_tags()
-labels = game.get_labels()
+game = None
+df = None
+tags = None
+labels = None
 
 
 def draw_num_of_game_per_tag():
+    print (game.get_data_pth())
     data = {'tag': [], 'num': []}
     for key in labels.keys():
         data['tag'].append(key)
@@ -93,40 +94,46 @@ def draw_viewer_channel():
     return fig
 
 
-## HTML layout for the web page
-app.layout = html.Div(children=[
-    html.H1(children='Twitch Analysis', style={'textAlign': 'center'}),
-
-    # draw 2 plots in one row
-    dbc.Row([
-        dbc.Col(
-            html.Div([
-                dcc.Graph(id='num_of_game_per_tag_graph', figure=draw_num_of_game_per_tag()),
-            ])
-        ),
-        dbc.Col(
-            html.Div([
-                dcc.Graph(id='total_viewers_graph', figure=draw_total_viewers()),
-            ])
-        )
-    ]),
-
-    dbc.Row([
-        dbc.Col(
-            html.Div([
-                dcc.Graph(id='aver_viewers_graph', figure=draw_average_viewers()),
-            ])
-        ),
-        dbc.Col(
-            html.Div([
-                dcc.Graph(id='peak_viewers_graph', figure=draw_peak_viewers()),
-            ])
-        ),
-    ]),
-
-    dcc.Graph(id='viewer_channel_graph', figure=draw_viewer_channel())
-])
-
-
-def show(debug: bool):
+def show(debug: bool, dir, timestamp):
+    # update global variables with input parameters
+    global game, df, tags, labels
+    game = Game(dir, timestamp)
+    df = game.get_data()
+    tags = game.get_tags()
+    labels = game.get_labels()
+
+    ## HTML layout for the web page
+    app.layout = html.Div(children=[
+        html.H1(children='Twitch Analysis', style={'textAlign': 'center'}),
+
+        # draw 2 plots in one row
+        dbc.Row([
+            dbc.Col(
+                html.Div([
+                    dcc.Graph(id='num_of_game_per_tag_graph', figure=draw_num_of_game_per_tag()),
+                ])
+            ),
+            dbc.Col(
+                html.Div([
+                    dcc.Graph(id='total_viewers_graph', figure=draw_total_viewers()),
+                ])
+            )
+        ]),
+
+        dbc.Row([
+            dbc.Col(
+                html.Div([
+                    dcc.Graph(id='aver_viewers_graph', figure=draw_average_viewers()),
+                ])
+            ),
+            dbc.Col(
+                html.Div([
+                    dcc.Graph(id='peak_viewers_graph', figure=draw_peak_viewers()),
+                ])
+            ),
+        ]),
+
+        dcc.Graph(id='viewer_channel_graph', figure=draw_viewer_channel())
+    ])
+
     app.run_server(debug=debug)