From c1765e578d0ada6374d723ad0f163d0bc162b960 Mon Sep 17 00:00:00 2001
From: RaSan <34002411+RaSan147@users.noreply.github.com>
Date: Mon, 23 Jan 2023 01:04:14 +0600
Subject: [PATCH] ugh forgot to copy paste from dev_src. V0.6.3 coming up

---
 CHANGELOG.MD            | 11 +++++++++++
 VERSION                 |  2 +-
 dev_src/local_server.py |  2 +-
 setup.cfg               |  2 +-
 src/server.py           | 35 ++++++++++++++---------------------
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index c266c44..950eaad 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,3 +1,14 @@
+# Version 0.6.3
+  ## Client-side Changes:
+  * Nothing to notice
+  ## Server-side Changes:
+  * HOTFIX: log_message now works like print funtion (*args), not like logger.log(format, *args)
+  ## Fixes:
+  * fixed log_message not working
+
+
+------------------------------------------------------------------------
+
 # Version 0.6.2
   ## Client-side Changes:
   * Nothing to notice
diff --git a/VERSION b/VERSION
index b616048..844f6a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.2
+0.6.3
diff --git a/dev_src/local_server.py b/dev_src/local_server.py
index 1eacdc6..6d0164c 100644
--- a/dev_src/local_server.py
+++ b/dev_src/local_server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = "0.6.1"
+__version__ = "0.6.3"
 enc = "utf-8"
 __all__ = [
 	"HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler",
diff --git a/setup.cfg b/setup.cfg
index 9875e2a..fe62020 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pyrobox
-version = 0.6.2
+version = 0.6.3
 authors = Rasan
 author_email= wwwqweasd147@gmail.com
 description = Personal DropBox for Private Network
diff --git a/src/server.py b/src/server.py
index 276bb76..b105314 100644
--- a/src/server.py
+++ b/src/server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = "0.6.1"
+__version__ = "0.6.3"
 enc = "utf-8"
 __all__ = [
 	"HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler",
@@ -1276,8 +1276,7 @@ def log_request(self, code='-', size='-'):
 		"""
 		if isinstance(code, HTTPStatus):
 			code = code.value
-		self.log_message('"%s" %s %s',
-						 self.requestline, str(code), str(size))
+		self.log_message(f'"{self.requestline}"', code, size)
 
 	def log_error(self, *args):
 		"""Log an error.
@@ -1290,45 +1289,35 @@ def log_error(self, *args):
 		XXX This should go to the separate error log.
 
 		"""
-		msg = " ".join(map(str, args))
-		self.log_message(msg, error = True)
+		self.log_message(args, error = True)
 
 	def log_warning(self, *args):
 		"""Log a warning"""
-		msg = " ".join(map(str, args))
-		self.log_message(msg, warning = True)
+		self.log_message(args, warning = True)
 
 	def log_debug(self, *args):
 		"""Log a debug message"""
-		msg = " ".join(map(str, args))
-		self.log_message(msg, debug = True)
+		self.log_message(args, debug = True)
 
 	def log_info(self, *args):
 		"""Default log"""
-		msg = " ".join(map(str, args))
-		self.log_message(msg)
+		self.log_message(args)
 		
 
 
 
-	def log_message(self, format, *args, error = False, warning = False, debug = False):
+	def log_message(self, *args, error = False, warning = False, debug = False):
 		"""Log an arbitrary message.
 
 		This is used by all other logging functions.  Override
 		it if you have specific logging wishes.
 
-		The first argument, FORMAT, is a format string for the
-		message to be logged.  If the format string contains
-		any % escapes requiring parameters, they should be
-		specified as subsequent arguments (it's just like
-		printf!).
-
 		The client ip and current date/time are prefixed to
 		every message.
 
 		"""
 
-		message = format % args
+		message = ' '.join(map(str, args))
 
 		message = ("# %s by [%s] at [%s] %s\n" %
 						 (self.req_hash, self.address_string(),
@@ -4945,14 +4934,18 @@ def run(port = None, directory = None, bind = None, arg_parse= True):
 							default=config.port, type=int,
 							nargs='?',
 							help='Specify alternate port [default: 8000]')
+		parser.add_argument('--version', '-v', action='version',
+							version=__version__)
+		
 		args = parser.parse_args()
 
 		port = args.port
 		directory = args.directory
 		bind = args.bind
 
-
-	print(tools.text_box("Running File: ", config.MAIN_FILE))
+	
+	print(tools.text_box("Running File: ", config.MAIN_FILE, "Version: ", __version__))
+	
 
 
 	if directory == config.ftp_dir and not os.path.isdir(config.ftp_dir):