Fix issues related to rename + update logger library

Author: sammartey

server/wsgi.py main.pyserver/wsgi.py renamed to main.py

@@ -1,15 +1,16 @@
 import sys
 import traceback
 
-import app
-from utils import logger
+from server import app
+from utils.logger import setup_logger, get_logger
+
+setup_logger('git2svn-sync')
+
+logger = get_logger(__name__)
 
 if __name__ == "__main__":
     try:
-        app.run_trackers()
-        # launch dev webserver
-        app.run_web_server()
-
+        app.run()
     except KeyboardInterrupt:
         logger.info("Stopped!")
         raise

repo/git_tracker.py

@@ -4,7 +4,7 @@
 import subprocess
 import threading
 
-from utils import utils
+from utils import file_utils
 from git import Repo
 
 from repo.tracker_base import TrackerBase
@@ -143,7 +143,7 @@ def apply(self, rev, diff, src: TrackerBase = None, files: list = ()):
     def retrieve_binaries(self, binary_files, rev: str, src: TrackerBase):
         for file in binary_files:
             file_byte_array = src.get_file(rev, file, is_binary=True)
-            utils.overwrite_file(f"{self.repo_path}/{file}", file_byte_array)
+            file_utils.overwrite_file(f"{self.repo_path}/{file}", file_byte_array)
 
     def format_and_save(self, rev, diff):
         diff_lines = git_format_diff(diff, revision="HEAD")

repo/svn_tracker.py

@@ -11,7 +11,7 @@
 from datetime import timezone
 import dateutil.parser as dateparser
 
-from utils import utils
+from utils import file_utils
 from repo.tracker_base import TrackerBase
 
 from utils.diff_tools import svn_format_diff, git_get_binary_files, git_get_rename_files
@@ -210,7 +210,7 @@ def force_rename(self, renamed_files):
             to_file = f"{self.repo.path}/{file['to']}"
             from_file = f"{self.repo.path}/{file['from']}"
             logger.info(f"Renaming {from_file} to {to_file}")
-            utils.create_folders(to_file)
+            file_utils.create_folders(to_file)
             self.run_svn_command("mv", ["--force", "--parents", from_file, to_file])
         if len(renamed_files) > 0:
             logger.info(self.run_svn_command("stat"))

repo/tracker_base.py

@@ -1,7 +1,7 @@
 import difflib
 from typing import List, NamedTuple
 
-from utils import utils, logger, diff_tools
+from utils import file_utils, logger, diff_tools
 
 logger = logger.get_logger(__name__)
 
@@ -54,7 +54,7 @@ def overwrite_file(self, file, contents):
         logger.debug(f"Overwrite contents: {contents}")
 
         file_path = f"{self.repo_path}/{file}"
-        utils.overwrite_file(file_path, contents)
+        file_utils.overwrite_file(file_path, contents)
 
     def get_file(self, rev, file, is_binary=False, encoding="utf-8-sig"):
         pass
@@ -63,7 +63,7 @@ def get_current_file(self, file, is_binary=False, encoding="utf-8-sig"):
         logger.info(f"Pulling contents of file (local) = {file} and is_binary={is_binary}")
 
         file_path = f"{self.repo_path}/{file}"
-        if not utils.file_exists(file_path):
+        if not file_utils.file_exists(file_path):
             return ""
 
         with open(file_path, "r", encoding=encoding) as file:
@@ -126,7 +126,7 @@ def check_identical_files(rev: str, src, tgt, files: List[str]) -> IdenticalChec
                 tgt_content: str = tgt.get_current_file(file)
                 print(f"Src: {src_content}")
                 print(f"Tgt: {tgt_content}")
-                if utils.is_content_identical(tgt_content, src_content):
+                if file_utils.is_content_identical(tgt_content, src_content):
                     identical_count += 1
                 else:
                     is_file_identical = False

server/app.py

@@ -3,10 +3,10 @@
 import threading
 from time import sleep
 
-import config
-from utils import tracker, utils
-import setup
-import web
+from server import config
+from utils import tracker, file_utils
+from server import setup
+from server import web
 
 from utils.logger import get_logger
 from repo.tracker_base import TrackerBase
@@ -30,7 +30,7 @@ def start_revision_tracker(name: str, source: TrackerBase, target: TrackerBase):
         try:
             if config.USE_TRIGGERS_TO_INITIATE_SYNC:
                 logger.info(f"{name}: Waiting for trigger to initiate sync")
-                utils.wait_until(web.has_trigger_for(name))
+                file_utils.wait_until(web.has_trigger_for(name))
                 # clear trigger counters
                 web.clear_trigger_counter(name)
 
@@ -73,7 +73,7 @@ def start_revision_tracker(name: str, source: TrackerBase, target: TrackerBase):
                 try:
                     logger.info(f"Processing rev: {rev} from position: {last_src_tracked_rev_pos}")
                     date, msg, author, diff, files = source.get_diff(rev)
-                    if not utils.remove_control_characters(str(diff)).strip():
+                    if not file_utils.remove_control_characters(str(diff)).strip():
                         logger.info(f"{name}: Diff was empty for revision: {rev}")
                         empty_count += 1
                         continue
@@ -121,22 +121,23 @@ def create_thread(args):
     return threading.Thread(target=start_revision_tracker, args=args, daemon=True)
 
 
-if __name__ == '__main__':
-    try:
-        setup.run()
-
-        # initialize trackers
-        trackers = setup.get_trackers()
-        for trk in trackers:
-            web.initialize(trk.name)
-            threads.append(create_thread([trk.name, trk.src, trk.tgt]))
+def run():
+    setup.run()
+    # initialize trackers
+    trackers = setup.get_trackers()
+    for trk in trackers:
+        web.initialize(trk.name)
+        threads.append(create_thread([trk.name, trk.src, trk.tgt]))
+    # start all worker threads
+    for t in threads:
+        t.start()
+    # launch dev webserver
+    web.run()
 
-        # start all worker threads
-        for t in threads:
-            t.start()
 
-        # launch dev webserver
-        web.run()
+if __name__ == '__main__':
+    try:
+        run()
 
     except KeyboardInterrupt:
         logger.info("Stopped!")

server/config.py

@@ -1,11 +1,11 @@
 import os
 
-from utils import utils
+from utils import file_utils
 from utils.logger import get_logger
 
 logger = get_logger(__name__)
 
-COMPANY_DOMAIN = "company.com"
+COMPANY_DOMAIN = "eztaxreturn.com"
 
 DUMMY_SVN = False
 USE_SVN_PATCH_FORMAT = True
@@ -18,10 +18,10 @@
 USE_TRIGGERS_TO_INITIATE_SYNC = False
 
 # app root
-app_root_dir = os.getcwd().replace("\\", "/")
+app_root_dir = "c:/work/repo/git2svn-sync/" or os.getcwd().replace("\\", "/")
 
 # synchronization mode 'source=>dest'
-default_sync_mode = 'git=>svn'
+default_sync_mode = 'svn=>git'
 
 # patches
 patches_dir = f"{app_root_dir}/output/patches/"
@@ -51,12 +51,12 @@
     #     'target_branch': "GitSvnMirror",
     # },
     {
-        'mode': "git=>svn",
-        'name': 'main_git2svn',
-        'source_url': "C:/git",
-        'source_branch': "main",
-        'target_url': "C:/svn",
-        'target_branch': "trunk",
+        'mode': "svn=>git",
+        'name': 'main_svn2git',
+        'source_url': "C:/work/test/scriptsez",
+        'source_branch': "trunk",
+        'target_url': "C:/work/repo/eztax-web",
+        'target_branch': "master",
     },
 ]
 
@@ -65,8 +65,8 @@
 logger.info(f"Git args: DUMMY_GIT={DUMMY_GIT}")
 
 for config in sync_configs:
-    source = "Git" if utils.is_git_to_svn_mode(config['mode']) else "Svn"
-    target = "Git" if utils.is_svn_to_git_mode(config['mode']) else "Svn"
+    source = "Git" if file_utils.is_git_to_svn_mode(config['mode']) else "Svn"
+    target = "Git" if file_utils.is_svn_to_git_mode(config['mode']) else "Svn"
 
     source_url = config['source_url']
     target_url = config['target_url']

server/setup.py

@@ -1,8 +1,8 @@
 from typing import List, NamedTuple
 
-import config
+from server import config
 
-from utils import utils
+from utils import file_utils
 
 from repo.git_tracker import TrackerBase
 from repo.git_tracker import GitTracker
@@ -26,12 +26,12 @@ def get_trackers(**kwargs) -> List[TrackerSetup]:
     # use sync configs to create svn/git watchers
     for sync in config.sync_configs:
         sync_name = sync['name']
-        if utils.is_git_to_svn_mode(sync['mode']):
+        if file_utils.is_git_to_svn_mode(sync['mode']):
             src = GitTracker(sync_name, sync['source_url'], sync['source_branch'], **kwargs)
             tgt = SvnTracker(sync_name, sync['target_url'], sync['target_branch'], **kwargs)
             trackers.append(TrackerSetup(sync_name, sync['mode'], src, tgt))
 
-        elif utils.is_svn_to_git_mode(sync['mode']):
+        elif file_utils.is_svn_to_git_mode(sync['mode']):
             src = SvnTracker(sync_name, sync['source_url'], sync['source_branch'], **kwargs)
             tgt = GitTracker(sync_name, sync['target_url'], sync['target_branch'], **kwargs)
             trackers.append(TrackerSetup(sync_name, sync['mode'], src, tgt))
@@ -45,10 +45,10 @@ def setup_folders():
 
     for fol in folders:
         logger.info(f"Creating folder: {fol}")
-        utils.create_folders(fol)
+        file_utils.create_folders(fol)
 
     for sync_config in config.sync_configs:
-        utils.create_folders(f"{config.patches_dir}{sync_config['name']}/")
+        file_utils.create_folders(f"{config.patches_dir}{sync_config['name']}/")
 
 
 def run():

server/test.py

@@ -2,7 +2,7 @@
 import traceback
 
 from server import config, setup
-import utils
+from utils import file_utils
 
 from utils.logger import get_logger
 from repo.git_tracker import GitTracker
@@ -17,10 +17,10 @@ def setup_folders():
 
     for fol in folders:
         logger.info(f"Creating folder: {fol}")
-        utils.create_folders(fol)
+        file_utils.create_folders(fol)
 
     for sync_config in config.sync_configs:
-        utils.create_folders(f"{config.patches_dir}{sync_config['name']}/")
+        file_utils.create_folders(f"{config.patches_dir}{sync_config['name']}/")
 
 
 def test_diffs(svn: SvnTracker, git: GitTracker):
@@ -63,7 +63,7 @@ def test_diffs(svn: SvnTracker, git: GitTracker):
     try:
         # setup
         setup.run()
-        utils.create_folders(f"{config.patches_dir}test/")
+        file_utils.create_folders(f"{config.patches_dir}test/")
 
         # init trackers
         svn_tracker = SvnTracker("test", "c:/svnrepo", "trunk", is_test=True)

utils/diff_tools.py

@@ -1,8 +1,6 @@
 import sys
 import re
 
-import utils
-
 re_head_svn = re.compile('^Index:')
 re_diff_git = re.compile('^diff --git ([^ ]+) ([^ ]+$)')
 re_diff_file_mode = re.compile('.+ file mode [0-9]+$')