assignment-4 solution

solutions/assignment-4/diff.py

@@ -0,0 +1,104 @@
+class Diff:
+
+    def __init__(self):
+        pass
+
+    def run(self,file1,file2):
+        file1_lines = open(file1, 'r').readlines()
+        file2_lines = open(file2, 'r').readlines()
+
+        lcs_table = self.generate_lcs_table(file1_lines, file2_lines)
+
+        rngs = list()
+
+        self.generate_ranges(lcs_table,file1_lines, file2_lines, len(file1_lines)-1, len(file2_lines)-1, rngs)
+        rngs = rngs[::-1]
+        self.merge_ranges(rngs)
+
+        self.print_diff(file1_lines, file2_lines, rngs)
+
+
+    def generate_lcs_table(self, file1_lines, file2_lines):
+
+        lcs_table = [[0 for i in range(len(file2_lines)+1)] for j in range(len(file1_lines)+1)]
+
+        for i in range(len(file1_lines)):
+            for j in range(len(file2_lines)):
+                if file1_lines[i] == file2_lines[j]:
+                    lcs_table[i][j] = lcs_table[i-1][j-1] + 1
+                else:
+                    lcs_table[i][j] = max(lcs_table[i-1][j], lcs_table[i][j-1])
+
+        return lcs_table
+
+    def generate_ranges(self,lcs_table, file1_lines, file2_lines, i, j, rngs):
+        if i<0 and j<0:
+            return
+        elif i < 0:
+            new_rng = rng(i+1,i+1,j,j+1)
+            rngs.append(new_rng)
+            print("added i<0:", new_rng)
+            self.generate_ranges(lcs_table, file1_lines, file2_lines, i, j-1, rngs)
+        elif j < 0:
+            new_rng = rng(i,i+1,j+1,j+1)
+            rngs.append(new_rng)
+            print("added j<0:", new_rng)
+            self.generate_ranges(lcs_table, file1_lines, file2_lines, i-1, j,rngs)
+        elif file1_lines[i] == file2_lines[j]:
+            self.generate_ranges(lcs_table, file1_lines, file2_lines, i-1, j-1,rngs)
+        elif lcs_table[i][j-1] >= lcs_table[i-1][j]:
+            new_rng = rng(i+1,i+1,j,j+1)
+            rngs.append(new_rng)
+            print("added >:", new_rng)
+            self.generate_ranges(lcs_table, file1_lines, file2_lines, i, j-1,rngs)
+        elif lcs_table[i][j-1] < lcs_table[i-1][j]:
+            new_rng = rng(i,i+1,j+1,j+1)
+            rngs.append(new_rng)
+            print("added <:", new_rng)
+            self.generate_ranges(lcs_table, file1_lines, file2_lines, i-1, j,rngs)
+
+    def merge_ranges(self, li):
+        i = 0
+        while True:
+            if i >= len(li)-1:
+                break
+            if li[i].file_1_end == li[i+1].file_1_start:
+                new_rng = rng(li[i].file_1_start, li[i+1].file_1_end, li[i].file_2_start, li[i+1].file_2_end)
+                del li[i:i+2]
+                li.insert(i, new_rng)
+            elif li[i].file_2_end == li[i+1].file_2_start:
+                new_rng = rng(li[i].file_1_start, li[i+1].file_1_end, li[i].file_2_start, li[i+1].file_2_end)
+                del li[i:i+2]
+                li.insert(i, new_rng)
+            else: i += 1
+        return li
+
+    def print_diff(self, file1_lines, file2_lines, rngs):
+        #just for individual ranges for now
+        i = 0
+        up_context_lines = 3
+        down_context_lines = 3
+        while True:
+            if i >= len(rngs):
+                break
+            line_top = rngs[i].file_1_start
+            line_bottom = rngs[i].file_2_end
+
+            for j in range(line_top-3,line_top):
+                if not j < 0:
+                    print(" " + file1_lines[j], end="")
+
+            for j in range(rngs[i].file_1_start, rngs[i].file_1_end):
+                print("-" + file1_lines[j], end="")
+            for j in range(rngs[i].file_2_start, rngs[i].file_2_end):
+                print("+" + file2_lines[j],end="")
+
+
+            for j in range(line_bottom,line_bottom+4):
+                try:
+                    print(" " + file2_lines[j], end="")
+                except IndexError:
+                    pass
+            print("--------------------------------")
+
+            i += 1

solutions/assignment-4/ngc.py

@@ -0,0 +1,238 @@
+import os
+import time
+import objects
+import logging
+import json
+from pathlib import Path
+
+class Ngc:
+
+    USER_NAME = 'user_name'
+    USER_EMAIL = 'user_email'
+    TIMESTAMP = 'timestamp'
+
+    def __init__(self, repo_path=os.getcwd()):
+        self.repo_path = repo_path
+        self.user_details = self._get_user_details()
+        self.author_details = self._get_author_details()
+        self.head = self._get_current_commit_hash()
+        self.obj_blob = objects.Blob()
+        self.obj_tree = objects.Tree(self.create_logger("Tree log"), self.repo_path)
+        self.obj_commit = objects.Commit(self.repo_path)
+        self.logger = self.create_logger("ngc_obj", log_level=logging.WARNING)
+
+    def init(self):
+        self.author_details = self.user_details
+        self.author_details[self.TIMESTAMP] = time.time()
+        self._set_author_details()
+        ngc_path = os.path.join(self.repo_path, ".ngc")
+        objects_path = os.path.join(ngc_path, "objects")
+
+        if not os.path.exists(ngc_path): os.makedirs(ngc_path)
+        if not os.path.exists(objects_path): os.makedirs(objects_path)
+
+    def status(self):
+        modified_files = list()
+        def print_mod(file_path, blob_path):
+            file_name = file_path.split("/")[-1]
+            print(f"modified:    {file_name}")
+        def print_del(file_path, blob_path):
+            file_name = file_path.split("/")[-1]
+            print(f"deleted:    {file_name}")
+        def print_add(file_path):
+            file_name = file_path.split("/")[-1]
+            print(f"added:    {file_name}")
+
+
+        print(f"On branch {self.head}")
+        print("Changes not committed:")
+        self._check_modified_files(mod_list=modified_files, mod_func=print_mod, del_func=print_del)
+        self._check_added_files(mod_list=modified_files, add_func=print_add)
+        print('Use "ngc commit" to add changes to a new commit')
+
+    def diff(self):
+        pass
+
+    def commit(self, message):
+        tree_hash = self.obj_tree.create()
+        parent_hash = self._get_current_commit_hash()
+        self.user_details[self.TIMESTAMP] = time.time()
+        commit_hash = self.obj_commit.create(tree_hash=tree_hash, author_details=self.author_details, committer_details=self.user_details, message=message, parent_hash=parent_hash)
+        self._update_commit_hash(commit_hash)
+
+    def reset(self):
+        modified_files = list()
+        def restore_file(file_path, blob_path):
+            self.obj_blob.extract_content(dst=file_path, file_path=blob_path)
+        def delete_file(file_path):
+            os.remove(file_path)
+
+        self._check_modified_files(mod_list=modified_files, mod_func=restore_file, del_func=restore_file)
+        self._check_added_files(mod_list=modified_files, add_func=delete_file)
+
+    def log(self, commit_hash=None):
+        if commit_hash is None: commit_hash = self.head
+        self.logger.info("logging...")
+
+        with open(os.path.join(self.repo_path, '.ngc/HEAD'), 'rb') as head_file:
+            current_hash = head_file.read().decode()
+            self.logger.debug("current_hash variable: %s" % (current_hash))
+            self.logger.debug("commit_hash_hash variable: %s" % (commit_hash))
+            self.logger.debug("self.head variable: %s" % (self.head))
+
+        while True:
+            if current_hash == commit_hash:
+                break
+            else:
+                with open(os.path.join(self.repo_path, f'.ngc/objects/{current_hash}'), 'rb') as commit_file:
+                    commit_data = json.load(commit_file)
+                current_hash = commit_data[self.obj_commit.PARENT]
+
+        while True:
+            self.obj_commit.print_commit_data(current_hash)
+            with open(os.path.join(self.repo_path, f'.ngc/objects/{current_hash}'), 'rb') as commit_file:
+                commit_data = json.load(commit_file)
+            if self.obj_commit.PARENT not in commit_data: break
+            else: current_hash = commit_data[self.obj_commit.PARENT]
+
+
+    def checkout(self, commit_hash=None):
+        if commit_hash is None: commit_hash = self.head
+
+        for dirpath, dirnames, filenames in os.walk(self.repo_path):
+            if ".ngc" in dirpath:
+                continue
+            for file in filenames:
+                if file is ".authorinfo" : continue
+                os.remove(os.path.join(dirpath, file))
+
+        tree_hash = self.obj_commit.get_tree_hash(commit_hash)
+        self._restore_files(tree_hash, self.repo_path)
+
+    def config_user(self, user_name, user_email):
+        self.user_details[self.USER_NAME] = user_name
+        self.user_details[self.USER_EMAIL] = user_email
+
+        with open(os.path.join(str(Path.home()), ".userinfo"), 'w') as user_info_file:
+            json.dump(self.user_details, user_info_file)
+
+    def _get_user_details(self):
+        info_file_path = os.path.join(str(Path.home()), ".userinfo")
+        user_details = {self.USER_NAME : None,
+                        self.USER_EMAIL : None,
+                        self.TIMESTAMP : None}
+
+        if os.path.exists(info_file_path):
+            with open(info_file_path, "r") as user_info_file:
+                user_details = json.load(user_info_file)
+
+        return user_details
+
+    def _set_author_details(self):
+        with open(os.path.join(self.repo_path, '.authorinfo'), 'w') as author_info_file:
+            json.dump(self.author_details, author_info_file)
+
+    def _get_author_details(self):
+        author_details = {self.USER_NAME : None,
+                          self.USER_EMAIL : None,
+                          self.TIMESTAMP : None}
+        author_file_path = os.path.join(self.repo_path, '.authorinfo')
+        if os.path.exists(author_file_path):
+            with open(author_file_path, 'r') as author_info_file:
+                author_details = json.load(author_info_file)
+
+        return author_details
+
+    def _get_current_commit_hash(self):
+        commit_hash = None
+        try:
+            with open(os.path.join(self.repo_path, ".ngc/HEAD"), "r") as head_file:
+                commit_hash = head_file.read()
+        except FileNotFoundError:
+            pass
+        return commit_hash
+
+    def _restore_files(self, tree_hash, dir_path):
+        tree_dict = self.obj_tree.get_tree_dict(tree_hash)
+
+        for file in tree_dict[self.obj_tree.FILES]:
+            blob_name = tree_dict[self.obj_tree.FILES][file]
+            blob_path = os.path.join(self.repo_path, ".ngc/objects", blob_name)
+            file_path = os.path.join(dir_path, file)
+            self.obj_blob.extract_content(blob_path, file_path)
+
+        for subdir in tree_dict[self.obj_tree.SUBDIRS]:
+            subdir_path = os.path.join(dir_path, subdir)
+            subdir_hash = tree_dict[self.obj_tree.SUBDIRS][subdir]
+            self._restore_files(subdir_hash, subdir_path)
+
+    def _update_commit_hash(self, new_commit_hash):
+        self.head = new_commit_hash
+        self.logger.info("Updated self.head to %s" % (self.head))
+
+        with open(os.path.join(self.repo_path, ".ngc/HEAD"), "w") as head_file:
+            head_file.write(new_commit_hash)
+
+    def _check_modified_files(self, tree=None, path=None, mod_list=None, mod_func=None, del_func=None):
+        if path is None : path = self.repo_path
+        if tree is None : tree = self.head
+
+        if tree is self.head:
+            with open(os.path.join(self.repo_path, ".ngc/objects", tree), "rb") as commit_file:
+                commit_data = json.load(commit_file)
+            tree = commit_data[self.obj_commit.TREE]
+        with open(os.path.join(self.repo_path, ".ngc/objects", tree), "rb") as tree_file:
+            tree_json = json.load(tree_file)
+        for file in tree_json[self.obj_tree.FILES]:
+            file_path = os.path.join(path, file)
+            blob_path = os.path.join(self.repo_path, ".ngc/objects", tree_json[self.obj_tree.FILES][file])
+            if os.path.exists(file_path):
+                file_content = open(file_path, 'rb').read()
+                blob_content = self.obj_blob.get_content(blob_path)
+                if file_content != blob_content:
+                    if type(mod_list) is list:
+                        mod_list.append(file)
+                    try:
+                        mod_func(file_path, blob_path)
+                    except TypeError:
+                        pass
+            else:
+                try:
+                    del_func(file_path, blob_path)
+                except TypeError:
+                    pass
+        for subdir in tree_json[self.obj_tree.SUBDIRS]:
+            new_path = os.path.join(path, subdir)
+            new_tree = tree_json[self.obj_tree.SUBDIRS][subdir]
+            self._check_modified_files(tree=new_tree, path=new_path, mod_list=mod_list, mod_func=mod_func, del_func=del_func)
+
+    def _check_added_files(self, mod_list=None, add_func=None):
+
+        for dirpath, dirnames, filenames in os.walk(self.repo_path):
+            if "." in dirpath:
+                continue
+            for file in filenames:
+                if file.startswith("."):
+                    continue
+                file_path = os.path.join(dirpath, file)
+                hexdigest = self.obj_blob._get_file_hash(file_path)
+                if hexdigest not in os.listdir(os.path.join(self.repo_path, '.ngc/objects')):
+                    if type(mod_list) is list:
+                        if file in mod_list:
+                            continue
+                    try:
+                        add_func(file_path)
+                    except TypeError:
+                        pass
+
+    @staticmethod
+    def create_logger(logger_name, log_level=logging.WARNING):
+
+        logger = logging.getLogger()
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        logger.setLevel(log_level)
+
+        return logger

solutions/assignment-4/ngc_cli.py

@@ -0,0 +1,35 @@
+import ngc
+import argparse
+from os import getcwd
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('command', nargs='+')
+    parser.add_argument('--location', type=str, default=getcwd())
+    args = parser.parse_args()
+
+    ngc_obj = ngc.Ngc(repo_path=args.location)
+
+    if args.command[0] == 'init':
+        ngc_obj.init()
+    elif args.command[0] == 'status':
+        ngc_obj.status()
+    elif args.command[0] ==  'commit':
+        commit_message = input("Enter commit message: ")
+        ngc_obj.commit(message=commit_message)
+    elif args.command[0] == 'log':
+        if len(args.command) == 1:
+            ngc_obj.log()
+        else:
+            ngc_obj.log(commit_hash=args.command[1])
+    elif args.command[0] == 'config_user':
+        ngc_obj.config_user(user_name=args.command[1], user_email=args.command[2])
+    elif args.command[0] == 'checkout':
+        if len(args.command) > 1:
+            ngc_obj.checkout(commit_hash=args.command[1])
+        else:
+            ngc_obj.checkout()
+    elif args.command[0] == 'reset':
+        ngc_obj.reset()
+    else:
+        print("Error: Command not recognized")