Merge pull request #10 from gjbex/development

Development

Author: gjbex

Diff for: README.md

@@ -1,4 +1,4 @@
-# Python for systems rogramming
+# Python for systems programming
 
 GitHub repository for participants of the "Python for systems programming" training.
 For information on the training, see the website

Diff for: source-code/command-line-arguments/Fire/README.md

@@ -5,6 +5,8 @@ applications with a command line interface.
 
 ## What is it?
 
-1. `calculator.py`: Calculator application that implements addition
-   and multiplication.
+1. `calculator.py`/`calculations.py`: Calculator application that
+   implements addition, substraction,  multiplication and division.
 1. `sayer.py`: Illustration of grouped commands.
+1. `cl_logger.py`/`log_management.py`/`log_operations.py`: logging
+   from the command line example.

Diff for: source-code/command-line-arguments/Fire/calculations.py

@@ -0,0 +1,14 @@
+def add(x, y):
+    return x + y
+
+def sub(x, y):
+    return x - y
+
+def mult(x, y):
+    return x*y
+
+def div(x, y):
+    return x/y
+
+def mod(x, y):
+    return x % y

Diff for: source-code/command-line-arguments/Fire/calculator.py

@@ -1,13 +1,7 @@
 #!/usr/bin/env python
 import fire
-
-
-def add(x, y):
-    return x + y
-
-def mult(x, y):
-    return x*y
+import calculations
 
 
 if __name__ == '__main__':
-    fire.Fire()
+    fire.Fire(calculations)

Diff for: source-code/command-line-arguments/Fire/cl_logger.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+import fire
+import log_operations
+
+
+if __name__ == '__main__':
+    fire.Fire(log_operations)

Diff for: source-code/command-line-arguments/Fire/log_management.py

@@ -0,0 +1,12 @@
+import re
+
+
+def create(file_name):
+    with open('.cl_logger.txt', 'w') as file:
+        print(f'file = {file_name}', file=file)
+
+def _get_log_file():
+    with open('.cl_logger.txt', 'r') as file:
+        for line in file:
+            if match := re.match('file = (.+)', line):
+                return match[1]

Diff for: source-code/command-line-arguments/Fire/log_operations.py

@@ -0,0 +1,17 @@
+from datetime import datetime as _datetime
+from log_management import _get_log_file, create
+
+
+def _log(level, msg):
+    time = _datetime.strftime(_datetime.now(), '%Y-%d-%m %H:%M:%S')
+    with open(_get_log_file(), 'a') as file:
+        print(f'{time} [{level}]: {msg}', file=file)
+
+def error(msg):
+    _log('error', msg)
+    
+def warning(msg):
+    _log('warning', msg)
+
+def info(msg):
+    _log('info', msg)

Diff for: source-code/command-line-arguments/Fire/sayer.py

@@ -4,30 +4,62 @@
 
 
 class Hello:
+    '''Hello group of commands, there is a to and a everyone
+    command
+    '''
 
     def __init__(self, name):
         self.name = name
 
-    def say(self):
-        return f'Hello {self.name}'
+    def to(self, name=None):
+        if name is None:
+            if self.name is None:
+                return 'No one to say hello to'
+            else:
+                return f'Hello to {self.name}'
+        else:
+            return f'Hello {name}'
+
+    def everyone(self):
+        return 'hello to everyone'
+
 
 class Bye:
+    '''Bye group of commands, there is a to and a no_one
+    command
+    '''
 
     def __init__(self, name):
         self.name = name
 
-    def say(self):
-        return f'Bye {self.name}'
+    def to(self, name=None):
+        if name is None:
+            if self.name is None:
+                return 'No one to say bye to'
+            else:
+                return f'Bye to {self.name}'
+        else:
+            return f'Bye {name}'
+
+    def no_one(self):
+        return f'Bye to no one'
 
 
 class Sayer:
+    '''Class to make the hello and bye groups available, it
+    also has its own to command, as well as the info command
+    '''
 
-    def __init__(self, hello_name, bye_name):
+    def __init__(self, hello_name=None, bye_name=None):
         self.hello = Hello(hello_name)
         self.bye =  Bye(bye_name)
 
-    def say(self):
-        return f'Bla, bla'
+    def to(self):
+        return 'Do you want to say hello or bye'
+
+    def info(self):
+        return 'This is version 0.1beta'
+
 
 if __name__ == '__main__':
     fire.Fire(Sayer)