unification of class names

Author: Coderbeep

leetcode/main.py

@@ -35,24 +35,24 @@ def main():
 
     stats_parser = subparsers.add_parser("stats", help="Display statistics")
     stats_parser.add_argument('username', type=str, help='User nickname', nargs='?')
-    stats_parser.set_defaults(func=userProblemsSolved)
+    stats_parser.set_defaults(func=UserProblemsSolved)
 
     problems_list_parser = subparsers.add_parser("list", help="Display problem list")
     problems_list_parser.add_argument('page', type=positive_integer, help='Page number', nargs='?', default=1)
-    problems_list_parser.set_defaults(func=problemsetQuestionList)
+    problems_list_parser.set_defaults(func=ProblemsetQuestionList)
 
     group = problems_list_parser.add_mutually_exclusive_group()
     group.add_argument('-s', '--solved', action='store_true', help='Display only solved problems.')
     group.add_argument('-t', '--todo', action='store_true', help='Display only to do.')
     group.add_argument('-a', '--attempted', action='store_true', help='Display only attempted problems.')
 
     problem_parser = subparsers.add_parser('problem', help="Display problem")
-    problem_parser.set_defaults(func=problemInfo)
+    problem_parser.set_defaults(func=ProblemInfo)
     problem_parser.add_argument('id', type=positive_integer, help='Problem ID of the problem')
     problem_parser.add_argument('-b', '--browser', action='store_true', help='Open the page in browser.')
 
     today_problem_parser = subparsers.add_parser('today', help="Display today's problem.")
-    today_problem_parser.set_defaults(func=questionOfToday)
+    today_problem_parser.set_defaults(func=QuestionOfToday)
 
     # submission_parser = subparsers.add_parser('submission', help="Download submission code")
     # submission_parser.add_argument('question_slug', type=str, help='Title slug of the problem.')
@@ -62,7 +62,7 @@ def main():
     submission_parser = subparsers.add_parser('submit', help='Submit code answer')
     submission_parser.add_argument('question_slug', type=str, help="Title slug of the question")
     submission_parser.add_argument('path', type=str, help='Path to the file with code answer')
-    submission_parser.set_defaults(func=sendSubmission)
+    submission_parser.set_defaults(func=SendSubmission)
 
     group_2 = today_problem_parser.add_mutually_exclusive_group()
     group_2.add_argument('-b', '--browser', action='store_true', help='Open the page in browser.')

leetcode/models/__init__.py

@@ -17,14 +17,14 @@
 from leetcode.graphql_query import GraphQLQuery
 from leetcode.template import QueryTemplate
 
-from leetcode.models.graphql_get_question_detail import getQuestionDetail
+from leetcode.models.graphql_get_question_detail import GetQuestionDetail
 from leetcode.models.graphql_problemset_question_list import \
-    problemsetQuestionList
-from leetcode.models.graphql_question_content import questionContent
-from leetcode.models.graphql_question_info_table import questionInfoTable
-from leetcode.models.graphql_question_of_today import questionOfToday
-from leetcode.models.graphql_submission_details import submissionDetails
-from leetcode.models.graphql_submission_list import submissionList
-from leetcode.models.graphql_user_problems_solved import userProblemsSolved
-from leetcode.models.problem_by_id_slug import problemInfo
-from leetcode.models.submit import sendSubmission
+    ProblemsetQuestionList
+from leetcode.models.graphql_question_content import QuestionContent
+from leetcode.models.graphql_question_info_table import QuestionInfoTable
+from leetcode.models.graphql_question_of_today import QuestionOfToday
+from leetcode.models.graphql_submission_details import SubmissionDetails
+from leetcode.models.graphql_submission_list import SubmissionList
+from leetcode.models.graphql_user_problems_solved import UserProblemsSolved
+from leetcode.models.problem_by_id_slug import ProblemInfo
+from leetcode.models.submit import SendSubmission

leetcode/models/graphql_get_question_detail.py

@@ -1,6 +1,6 @@
 from leetcode.models import *
 
-class getQuestionDetail(QueryTemplate):
+class GetQuestionDetail(QueryTemplate):
     def __init__(self, title_slug: str):
         super().__init__()
         # Instance-specific variables

leetcode/models/graphql_problemset_question_list.py

@@ -32,7 +32,7 @@ def from_dict(cls, data):
 @dataclass
 class TotalCount(JSONWizard):
     total: int
-class problemTotalCount(QueryTemplate):
+class ProblemTotalCount(QueryTemplate):
     def __init__(self):
         super().__init__()
         self.graphql_query = None
@@ -49,7 +49,7 @@ def __call__(self, *args: Any, **kwds: Any) -> Any:
         return self.result['data']['problemsetQuestionList']['total']
 
 
-class problemsetQuestionList(QueryTemplate):
+class ProblemsetQuestionList(QueryTemplate):
     def __init__(self):
         super().__init__()
         # Instance specific variables
@@ -95,7 +95,7 @@ def validate_page(self):
         """ Method to validate the page number. If number is too large,
             set the page number to the last page."""
 
-        count = problemTotalCount().__call__()
+        count = ProblemTotalCount().__call__()
         if self.page > -(-count // self.limit): # ceil(total / limit)
             self.page = -(-count // self.limit)
             self.params['skip'] = self.limit * self.page - self.limit # update the skip value

leetcode/models/graphql_question_content.py

@@ -1,6 +1,6 @@
 from . import *
 
-class questionContent(QueryTemplate):
+class QuestionContent(QueryTemplate):
     def __init__(self, titleSlug):
         super().__init__()
         self.params = {'titleSlug': titleSlug}

leetcode/models/graphql_question_info_table.py

@@ -28,7 +28,7 @@ def from_dict(cls, data):
 
         return cls(questionId=questionId, questionFrontendId=questionFrontendId, title=title, titleSlug=titleSlug, isPaidOnly=isPaidOnly, difficulty=difficulty, likes=likes, dislikes=dislikes, categoryTitle=categoryTitle, status=status)
 
-class questionInfoTable(QueryTemplate):
+class QuestionInfoTable(QueryTemplate):
     def __init__(self, titleSlug: str = None):
         super().__init__()
         self.params = {'titleSlug': titleSlug}

leetcode/models/graphql_question_of_today.py

@@ -32,63 +32,64 @@ def from_dict(cls, data):
 
         return cls(date=date, userStatus=userStatus, link=link, question=question)  
 
-class questionOfToday(QueryTemplate):
+class QuestionOfToday(QueryTemplate):
     def __init__(self):
         super().__init__()
         # Instance specific variables
         self.contentFlag = False
         self.browserFlag = False
+        self.title_slug: str = None
 
         self.params = {}
         self.graphql_query = None
         self.result = None
 
+    def parse_args(self, args):
+        if getattr(args, 'browser'): 
+            self.browserFlag = True
+        if getattr(args, 'contents'):
+            self.contentFlag = True
+    
     def execute(self, args):
         with Loader('Fetching question of the day...', ''):
             self.parse_args(args)
 
             self.graphql_query = GraphQLQuery(self.query, self.params)
             self.result = self.leet_API.post_query(self.graphql_query)
             self.result = QueryResult.from_dict(self.result['data'])
+            self.title_slug = self.result.question.titleSlug
         self.show()
-        
-    def parse_args(self, args):
-        if getattr(args, 'browser'): 
-            self.browserFlag = True
-        if getattr(args, 'contents'):
-            self.contentFlag = True
 
-    def show_info_table(self):
-
-        question = self.result.question
+    # def show_info_table(self):
+    #     question = self.result.question
 
-        table = LeetTable()
-        table.add_column('ID')
-        table.add_column('Title')
-        table.add_column('Status')
-        table.add_column('Difficulty')
+    #     table = LeetTable()
+    #     table.add_column('ID')
+    #     table.add_column('Title')
+    #     table.add_column('Status')
+    #     table.add_column('Difficulty')
 
-        table.add_row(question.frontendQuestionId, question.title,
-                      question.status, question.difficulty)
+    #     table.add_row(question.frontendQuestionId, question.title,
+    #                   question.status, question.difficulty)
 
-        print(table)
+    #     print(table)
 
     def show(self):
+        question_info_table = QuestionInfoTable(self.title_slug)
         if self.contentFlag:
-            self.show_info_table()
+            print(question_info_table)
             print()
-            titleSlug = self.result.question.titleSlug
             with Loader('Fetching question content...', ''):
-                question_content = questionContent(titleSlug)
+                question_content = QuestionContent(self.title_slug)
             print(question_content)
-            
         elif self.browserFlag:
-            self.show_info_table()
+            print(question_info_table)
             link = self.config.host + self.result.link
             print(f'Link to the problem: {link}')
             self.open_in_browser(link)
         else:
-            self.show_info_table()
+            print(question_info_table)
+
 
 
 

leetcode/models/graphql_question_title.py

@@ -28,7 +28,7 @@ def from_dict(cls, data):
 
         return cls(questionId=questionId, questionFrontendId=questionFrontendId, title=title, titleSlug=titleSlug, isPaidOnly=isPaidOnly, difficulty=difficulty, likes=likes, dislikes=dislikes, categoryTitle=categoryTitle, status=status)
 
-class questionInfoTable(QueryTemplate):
+class QuestionInfoTable(QueryTemplate):
     def __init__(self, titleSlug: str = None):
         super().__init__()
         self.params = {'titleSlug': titleSlug}

leetcode/models/graphql_submission_details.py

@@ -12,7 +12,7 @@ def from_dict(cls, data):
         return cls(runtime=data['runtime'], memory=data['memory'], code=data['code'])
 
 
-class submissionDetails(QueryTemplate):
+class SubmissionDetails(QueryTemplate):
     def __init__(self, submission_id) -> None:
         super().__init__()
         # Instance specific variables

leetcode/models/graphql_submission_list.py

@@ -11,7 +11,7 @@ class Submission():
     langName: str
 
 @dataclass
-class questionSubmisstionList(JSONWizard):
+class QuestionSubmisstionList(JSONWizard):
     submissions: List[Submission]
 
     @classmethod
@@ -28,7 +28,7 @@ def from_dict(cls, data):
         return cls(submissions=submissions)
 
 
-class submissionList(QueryTemplate):
+class SubmissionList(QueryTemplate):
     def __init__(self):
         super().__init__()
         # Instance specific variables
@@ -52,7 +52,7 @@ def execute(self, args):
 
         self.graphql_query = GraphQLQuery(self.query, self.params)
         self.result = self.leet_API.post_query(self.graphql_query)
-        self.result = questionSubmisstionList.from_dict(self.result['data'])
+        self.result = QuestionSubmisstionList.from_dict(self.result['data'])
         if self.list_view:
             self.show()
         if self.submission_download:
@@ -75,6 +75,6 @@ def show(self):
 
     def get_code(self):
         # TODO: returning the code of the first submission for now
-        submission_details = submissionDetails(self.result.submissions[0].id)
+        submission_details = SubmissionDetails(self.result.submissions[0].id)
         submission_details.execute()
         return submission_details.result.code