Update misc.py

README.md

@@ -1,11 +1,11 @@
-![octosuite](img/logo.png)
+![octosuite](images/logo.png)
 
 ![OS](https://img.shields.io/badge/OS-GNU%2FLinux-red?style=for-the-badge&logo=Linux)
 ![OS](https://img.shields.io/badge/OS-Windows-blue?style=for-the-badge&logo=Windows)
 ![OS](https://img.shields.io/badge/OS-Mac-white?style=for-the-badge&logo=apple)
 ![GitHub](https://img.shields.io/github/license/rly0nheart/octosuite?style=for-the-badge&logo=github)
 ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/rly0nheart/octosuite?style=for-the-badge&logo=github)
-![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/rly0nheart/octosuite/1.9.0?style=for-the-badge&logo=github)
+![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/rly0nheart/octosuite/2.0.0-beta?style=for-the-badge&logo=github)
 ![GitHub repo size](https://img.shields.io/github/repo-size/rly0nheart/octosuite?style=for-the-badge&logo=github)
 
 > *Simply gather OSINT on Github users & organizations like a God🔥*

core/main.py

@@ -16,14 +16,15 @@
 import os
 import sys
 import logging
+import getpass
 import requests
 import platform
 import subprocess
 from tqdm import tqdm
 from pprint import pprint
-from utils.misc import Banner
+from utilities.misc import Banner
-from utils.helper import Help
+from utilities.helper import Help
-from utils.colors import Color
+from utilities.colors import Color
 from datetime import datetime
 
 
@@ -315,7 +316,7 @@ class Octosuite:
         # Use 'cls' to clear screen on Windows based machines
         # Otherwise, use 'clear'
         while True:
-            command_input = input(f'''\n{Color.white}┌──({Color.red}{os.getlogin()}{Color.white}@{Color.red}octosuite{Color.white})-[{Color.green}{os.getcwd()}{Color.white}]\n└╼[{Color.green}:_{Color.white}]{Color.reset} ''')        
+            command_input = input(f'''\n{Color.white}┌──({Color.red}{getpass.getuser()}{Color.white}@{Color.red}octosuite{Color.white})-[{Color.green}{os.getcwd()}{Color.white}]\n└╼[{Color.green}:_{Color.white}]{Color.reset} ''')        
             # Looping through the commands base to check if the user input command matches any command in the commands base, and return its functionality
             # If no match is found, we ignore it
             for command, functionality in self.commands_map:
@@ -673,7 +674,7 @@ class Octosuite:
     
     # Update program
     def installUpdate(self):
-    	files_to_update = ['core/main.py','utils/helper.py','utils/misc.py','utils/colors.py','utils/changelog.py','octosuite','.github/dependabot.yml','.github/ISSUE_TEMPLATE/bug_report.md','.github/ISSUE_TEMPLATE/feature_request.md','.github/ISSUE_TEMPLATE/config.yml','LICENSE','README.md','requirements.txt']
+    	files_to_update = ['core/main.py','utilities/helper.py','utilities/misc.py','utilities/colors.py','octosuite','.github/dependabot.yml','.github/ISSUE_TEMPLATE/bug_report.md','.github/ISSUE_TEMPLATE/feature_request.md','.github/ISSUE_TEMPLATE/config.yml','LICENSE','README.md','requirements.txt']
     	logging.info(logMsg.installingUpdates)
     	for file in tqdm(files_to_update,desc = logMsg.installingUpdates):
     		data = requests.get(f'https://raw.githubusercontent.com/rly0nheart/octosuite/master/{file}')
@@ -700,25 +701,12 @@ class Octosuite:
     	# It's actually frustrating having to change this everytime I publish a new release lol
     	print(f'''
 Tag: {Banner.versionTag}
-Released at: 2022-05-20 03:26AM
+Released at: 2022-05-25 11:05AM
 {'-'*31}
 
 What's changed?
 {'-'*15}
-[✓] The PyPI package has been deprecated and will no longer receive any further updates
+[✓] Fixed a bug in issue #2''')
-[✓] Added a functionality for returning organizations belonging to a target user (user:orgs)
-[✓] Added a functionality for returning a target user's subscriptions (user:subscriptions)
-[✓] Added a functionality for returning a target user's events (user:events)
-[✓] Added a functionality for returning a list of contributors of a repository (repo:contributors)
-[✓] Added a functionality for returning languages of a repository (repo:languages)
-[✓] Added a functionality for returning stargazers of a repository (repo:stargazers)
-[✓] Added a functionality for returning forks of a repository (repo:forks)
-[✓] Added a functionality for checking for latest releases of Octosuite (update:check)
-[✓] Added the "clear" command for clearing the screen in the Octosuite command prompt
-[✓] Moved the use of the 'update' comnand to 'update:install'
-[✓] Will no longer show the "Press any key to continue" prompt, it will instead return its command prompt
-[✓] Commands are no longer case sensitive
-[✓] Major perfomance improvements''')
     	
     	
     # Author info

downloads/.downloads

@@ -0,0 +1 @@
+

images/.images

@@ -0,0 +1 @@
+

octosuite

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 import logging
-from utils.colors import Color
+from utilities.colors import Color
-from utils.misc import Banner
+from utilities.misc import Banner
 from core.main import Octosuite, Attributes, logMsg
 
 print(Banner.nameLogo)
@@ -16,4 +16,4 @@ if __name__ == '__main__':
         
     except Exception as e:
         logging.error(logMsg.Error.format(e))
-        print(Attributes.error, logMsg.Exception.format(f'{Color.red}{e}{Color.reset}'))
+        print(Attributes.error, logMsg.Error.format(f'{Color.red}{e}{Color.reset}'))

utilities/colors.py

@@ -1,5 +1,5 @@
-import os
 import sys
+import getpass
 import platform
 from datetime import datetime
 
@@ -39,7 +39,7 @@ class Color:
 	    print("\n")
 	    while True:
 	        try:
-	            color_chooser = input(f"[ ? ] Welcome {os.getlogin()}, would you like to enable colors for this session? (y/n) ")
+	            color_chooser = input(f"[ ? ] Welcome {getpass.getuser()}, would you like to enable colors for this session? (y/n) ")
 	            if color_chooser.lower() == "y":
 	                white = "\033[97m"
 	                red = "\033[91m"

utilities/helper.py

@@ -1,4 +1,4 @@
-from utils.colors import Color
+from utilities.colors import Color
 
 class Help:
     usageText = 'Use {} to get started'

utilities/misc.py

@@ -1,18 +1,18 @@
-import os
+import getpass
-from utils.colors import Color
+from utilities.colors import Color
 
 class Banner:
-    versionTag = '2.0.0-beta'
+    versionTag = '2.0.1-alpha'
     nameLogo = f'''{Color.white}
  _______        __          _______         __ __         
 |       |.----.|  |_.-----.|     __|.--.--.|__|  |_.-----.
 |   -   ||  __||   _|  _  ||__     ||  |  ||  |   _|  -__|
 |_______||____||____|_____||_______||_____||__|____|_____|
-                                                    v{versionTag}
+                                              v{versionTag}
                          {Color.white}— Advanced Github {Color.red}OSINT{Color.white} Framework{Color.reset}
 
 
-.:{Color.white}{Color.green}{os.getlogin()}{Color.reset}:.    
+.:{Color.white}{Color.green}{getpass.getuser()}{Color.reset}:.    
 
 - {Color.white}Use {Color.green}help{Color.reset}{Color.white} command for usage{Color.reset}
 - {Color.white}Commands are case insensitive{Color.reset}