Minor refactoring

README.md

@@ -44,8 +44,7 @@ Please [open an issue](https://github.com/Justin-Byrne/ClassGenerator/issues/new
 ├── LICENSE
 ├── README.md
 ├── docs
-│   ├── CHANGELOG.md
-│   └── commands.txt
+│   └── CHANGELOG.md
 └── source
     ├── app
     │   ├── BuildClass.py

docs/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.3.1] - 2023-04-20
+### Changed
+- Refactored and refined get_files ( ) and generator
+- Updated README.md
+
 ## [0.3.0] - 2023-04-20
 ### Added
 - System utilities, get_files ( ), list_to_string ( ), parse_commands
@@ -36,7 +41,9 @@ All notable changes to this project will be documented in this file.
 
 ---
 
-[0.3.0]: 2023-04-20 [CURRENT REVISION] System utility additions, and general revisions
+[0.3.1]: 2023-04-20 [CURRENT REVISION] Minor refactoring
+
+[0.3.0]: 2023-04-20 [4dbb4d9](https://github.com/Justin-Byrne/ClassGenerator/commit/4dbb4d9) System utility additions, and general revisions
 
 [0.2.0]: 2023-04-17 [7968397](https://github.com/Justin-Byrne/ClassGenerator/commit/7968397) Further utility implementation, and general revision(s)
 

source/app/core/generator.py

@@ -73,26 +73,21 @@ def init ( self ):
 
 		self.get_files ( )
 
+		# process files
+
 	#### 	GETTERS 	########################################
 
 	def get_files ( self ):
 
-		if ( Util.is_file ( self.arguments [ 'source' ] ) ):
+		if ( Util.is_file ( self.arguments [ 'source' ] ) ): 					# If: source is file
 
 			self.files.append ( self.arguments [ 'source' ] )
 
-		elif ( Util.is_directory ( self.arguments [ 'source' ] ) ):
-
-			if 'omit_files' in self.arguments.keys ( ):
+		elif ( Util.is_directory ( self.arguments [ 'source' ] ) ): 			# If: source is directory
 
-				self.files = Util.get_files ( self.arguments [ 'source' ], '.js', self.arguments [ 'omit_files'] )
-
-			else:
+			self.files = Util.get_files ( self.arguments [ 'source' ], '.js', self.arguments [ 'omit_files' ] if 'omit_files' in self.arguments.keys ( ) else '' )
 
-				self.files = Util.get_files ( self.arguments [ 'source' ], '.js' )
-
-
-	#### 	~  ~  ~  ~  ~  ~  ~  ~  ~  ~  ~  ~  ~  ~  ~  	####
+	# -------------------------------------------------------- #
 
 	def remove_elements ( self ):
 
@@ -296,4 +291,3 @@ def render_output ( self ):
 			writer.write ( self.diagram [ 'master' ] )
 
 			print ( '>>  [ output ] ', output_directory )
-

source/app/utilities/system/file/get_files.py

@@ -46,5 +46,8 @@ def filter_omissions ( ):
 
 					result.append ( f"{root}/{entry}" )
 
+	# for item in result:
+
+		# print ( item )
 
 	return result