Moving Halo output within 'initialize_wordcloud()' and 'generate()'

JosephLai241 · Jul 3, 2021 · c4a9ec2 · c4a9ec2
1 parent b35f3ad
commit c4a9ec2
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/urs/analytics/Wordcloud.py b/urs/analytics/Wordcloud.py
@@ -52,11 +52,23 @@ def initialize_wordcloud(file, scrape_type):
             WordCloud instance
         """
 
-        return WordCloud(
+        frequencies = PrepData.prep(file[0], scrape_type)
+
+        initialize_status = Status(
+            "Generated wordcloud.",
+            "Generating wordcloud.",
+            "white"
+        )
+
+        initialize_status.start()
+        wordcloud = WordCloud(
             height = 1200,
             max_font_size = 400,
             width = 1600
-        ).generate_from_frequencies(PrepData.prep(file[0], scrape_type))
+        ).generate_from_frequencies(frequencies)
+        initialize_status.succeed()
+
+        return wordcloud
 
     @staticmethod
     def modify_wordcloud(wc):
@@ -189,21 +201,9 @@ def generate(args):
 
         for scrape_file in args.wordcloud:
             analytics_dir, scrape_type = GetPath.get_scrape_type(scrape_file[0], "wordcloud")
-
-            initialize_status = Status(
-                "Initialized wordcloud.",
-                "Initializing wordcloud.",
-                "white"
-            )
-
-            initialize_status.start()
             wc = SetUpWordcloud.initialize_wordcloud(scrape_file, scrape_type)
-            initialize_status.succeed()
-
-            Halo().info("Generating wordcloud.")
-            print()
             plt = SetUpWordcloud.modify_wordcloud(wc)
-            
+
             FinalizeWordcloud().show_wordcloud(plt) \
                 if args.nosave \
                 else FinalizeWordcloud().save_wordcloud(analytics_dir, scrape_file, wc)