Refactored structure

getcodelimit · Nov 6, 2022 · 90f5510 · 90f5510
1 parent f2b44b2
commit 90f5510
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 18 deletions.
diff --git a/clim b/clim
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-import plotext
 
-from codelimit.Scanner import scan
+from codelimit.common.Scanner import scan
 from codelimit.version import version, release_date
 
 print('Code Limit')

diff --git a/codelimit/Location.py → codelimit/common/Location.py b/codelimit/Location.py → codelimit/common/Location.py
diff --git a/codelimit/Report.py → codelimit/common/Report.py b/codelimit/Report.py → codelimit/common/Report.py
diff --git a/codelimit/Scanner.py → codelimit/common/Scanner.py b/codelimit/Scanner.py → codelimit/common/Scanner.py
@@ -2,9 +2,9 @@
 
 from halo import Halo
 
-from codelimit.Python import get_headers, get_blocks
-from codelimit.Report import Report, Measurement
-from codelimit.Scope import build_scopes
+from codelimit.languages.python.Python import get_headers, get_blocks
+from codelimit.common.Report import Report, Measurement
+from codelimit.common.Scope import build_scopes
 
 
 def is_hidden(root, file):

diff --git a/codelimit/Scope.py → codelimit/common/Scope.py b/codelimit/Scope.py → codelimit/common/Scope.py
@@ -1,4 +1,4 @@
-from codelimit.SourceRange import Header, Block
+from codelimit.common.SourceRange import Header, Block
 
 
 class Scope:

diff --git a/codelimit/Source.py → codelimit/common/Source.py b/codelimit/Source.py → codelimit/common/Source.py
@@ -1,5 +1,5 @@
-from codelimit.Location import Location
-from codelimit.SourceRange import SourceRange
+from codelimit.common.Location import Location
+from codelimit.common.SourceRange import SourceRange
 
 
 def index_to_location(code: str, index: int) -> Location:

diff --git a/codelimit/SourceRange.py → codelimit/common/SourceRange.py b/codelimit/SourceRange.py → codelimit/common/SourceRange.py
@@ -1,4 +1,4 @@
-from codelimit.Location import Location
+from codelimit.common.Location import Location
 
 
 class SourceRange:

diff --git a/codelimit/common/__init__.py b/codelimit/common/__init__.py
diff --git a/codelimit/languages/__init__.py b/codelimit/languages/__init__.py
diff --git a/codelimit/Python.py → codelimit/languages/python/Python.py b/codelimit/Python.py → codelimit/languages/python/Python.py
@@ -1,8 +1,8 @@
 from re import finditer
 
-from codelimit.Location import Location
-from codelimit.Source import index_to_location
-from codelimit.SourceRange import Block, Header
+from codelimit.common.Location import Location
+from codelimit.common.Source import index_to_location
+from codelimit.common.SourceRange import Block, Header
 
 
 def get_indentation(line: str):

diff --git a/codelimit/languages/python/__init__.py b/codelimit/languages/python/__init__.py
diff --git a/tests/common/__init__.py b/tests/common/__init__.py
diff --git a/tests/test_Block.py → tests/common/test_Block.py b/tests/test_Block.py → tests/common/test_Block.py
@@ -1,5 +1,5 @@
-from codelimit.Location import Location
-from codelimit.SourceRange import Block
+from codelimit.common.Location import Location
+from codelimit.common.SourceRange import Block
 
 
 def test_str():

diff --git a/tests/test_Position.py → tests/common/test_Position.py b/tests/test_Position.py → tests/common/test_Position.py
@@ -1,4 +1,4 @@
-from codelimit.Location import Location
+from codelimit.common.Location import Location
 
 
 def test_str():

diff --git a/tests/test_Source.py → tests/common/test_Source.py b/tests/test_Source.py → tests/common/test_Source.py
@@ -1,5 +1,5 @@
-from codelimit.Location import Location
-from codelimit.Source import index_to_location, location_to_index
+from codelimit.common.Location import Location
+from codelimit.common.Source import index_to_location, location_to_index
 
 
 def test_index_to_location_single_line():

diff --git a/tests/languages/__init__.py b/tests/languages/__init__.py
diff --git a/tests/languages/python/__init__.py b/tests/languages/python/__init__.py
diff --git a/tests/test_Python.py → tests/languages/python/test_Python.py b/tests/test_Python.py → tests/languages/python/test_Python.py
@@ -1,4 +1,4 @@
-from codelimit.Python import get_indentation, get_blocks, get_headers
+from codelimit.languages.python.Python import get_indentation, get_blocks, get_headers
 
 
 def test_get_indentation():