update_change is now smarter

Author: DumbMachine

syncboostnote/bns.yaml

@@ -1,5 +1,5 @@
 BOOSTNOTE_PATH: default # default: /home/$USER/Boostnote
-FREQUENCY: hourly # ["hourly", "daily", "weekly", "onchange", "manual"]
+FREQUENCY: manual # ["hourly", "daily", "weekly", "onchange", "manual"] Others will be implemented soon.
 SHIELDS: true
-SHIELDS_TYPE: for-the-badge # default: for-the-badge
-TIME: 1200
+SHIELDS_TYPE: for-the-badge # ['plastic' , 'flat', 'flat-square', 'for-the-badge', 'popout', 'popout-square', 'social']
+# TIME: 1200 Not recommended

syncboostnote/cli.py

@@ -11,7 +11,7 @@
 import yaml
 from colorama import Fore, init
 
-from .config import Config, config_reader, interactive
+from .config import Config, config_reader, interactive, generate_config
 from .utils import initialize
 from .test import sync
 
@@ -41,12 +41,12 @@ def options():
         help="Location of the BoostNotes local storage.",
         default=os.path.join(home, 'Boostnote'))
 
-    ap.add_argument(
-        "-ini",
-        "--init",
-        required=False,
-        help="Initialise the CLI",
-        default=False)
+    # ap.add_argument(
+    #     "-ini",
+    #     "--init",
+    #     required=False,
+    #     help="Initialise the CLI",
+    #     default=False)
 
     ap.add_argument(
         "--sync",
@@ -55,18 +55,18 @@ def options():
     )
 
     ap.add_argument(
-        "-cus",
-        "--custom",
+        "-co",
+        "--config",
         required=False,
         help="Location of the config.yaml/config.yml file",
         default=False)
 
     ap.add_argument(
         "-g",
         "--generate",
-        required=False,
         help="Generate config.yaml file for ya",
-        default=False)
+        action='store_true'
+    )
 
     ap.add_argument(
         "-i",
@@ -85,8 +85,10 @@ def starter(args):
     '''
     if args['sync']:
         sync()
+    elif args['generate']:
+        return generate_config()
+
     elif args['interactive']:
-        print('>>> Interactive <<<')
         return interactive()
 
     elif args['location']:

syncboostnote/config.py

@@ -58,14 +58,15 @@ def hook():
     return result
 
 
-def create_config(location='.'):
+def generate_config():
     '''
     Creates a default config for users to see.
     '''
-    yaml.dump(
-        Config,
-        open(os.path.join(location, 'bns.yaml'), 'w+')
-    )
-
-
-# create_config()
+    open(
+        'config.yaml', 'w+'
+    ).write('''BOOSTNOTE_PATH: default # default: /home/$USER/Boostnote
+FREQUENCY: manual # ["hourly", "daily", "weekly", "onchange", "manual"] Others will be implemented soon.
+SHIELDS: true
+SHIELDS_TYPE: for-the-badge # ['plastic' , 'flat', 'flat-square', 'for-the-badge', 'popout', 'popout-square', 'social']
+# TIME: 1200 Not recommended
+''')

syncboostnote/test.py

@@ -24,11 +24,18 @@ def sync(
         os.system("git push origin master")
     else:
         print("Adding all the things")
-        os.system("git add -A")
+        p = subprocess.Popen(
+            "git add -A", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
         # print("Commiting all the things")
-        os.system("git commit -m '.'")
+        p1 = subprocess.Popen(
+            f"git commit -m '{datetime.now()}'", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        for line in p1.stdout.readlines()[2:]:
+            print(line.decode("utf-8"))
+
         # print("Pushing all the things")
-        os.system("git push origin master")
+        p2 = subprocess.Popen(
+            "git push origin master", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     retval = p.wait()
 

syncboostnote/utils.py

@@ -8,7 +8,7 @@
 from glob import glob
 
 import cson
-
+import subprocess
 from .test import git_update
 
 home = os.path.expanduser("~")
@@ -21,7 +21,7 @@ def initialize(config):
     - Make directory for storing notes.
     - Create History
     # ! - Initialize the git repo.
-    ------------------------------------
+    -----------------s-------------------
     called:
         - Is called upon using  --initialize flag of the CLI
     '''
@@ -120,22 +120,22 @@ def ultimate(config):
         - updates the .md files, which require it.
     -----------------------------------------------
     '''
-    print("Searching for BOOSTNOTE_PATH", end='\r')
-    sys.stdout.flush()
+    # print("Searching for BOOSTNOTE_PATH", end='\r')
+    # sys.stdout.flush()
     if not os.path.isfile(os.path.join(config['BOOSTNOTE_PATH'], 'history.json')):
 
         # Create the History json again.
         create_history(config['BOOSTNOTE_PATH'])
     if boostnote_exists(config['BOOSTNOTE_PATH']):
 
         # Creating History again, as this will track if new files have been added.
-        sys.stdout.flush()
-        print("Creating History.json file", end='\r')
+        # sys.stdout.flush()
+        # print("Creating History.json file", end='\r')
 
         create_history(config['BOOSTNOTE_PATH'])
 
-        sys.stdout.flush()
-        print("Creation done!", end='\r')
+        # sys.stdout.flush()
+        # print("Creation done!", end='\r')
 
         history_json = json.load(open(os.path.join(
             config['BOOSTNOTE_PATH'], 'history.json'), 'r'))
@@ -175,7 +175,8 @@ def cson_reader(location):
         data = cson.load(open(location, 'r'))
         return data
     else:
-        raise FileNotFoundError(f'The cson file at {location} was not found')
+        return 0
+        # raise FileNotFoundError(f'The cson file at {location} was not found')
 
 
 def customshield(
@@ -210,67 +211,67 @@ def markdown_writer(things, location, shields=True,
         The dict{} which contains shit that was read via the cson
 
     '''
+    if things:
+        embels = ['isStarred', 'isTrashed',
+                  'updatedAt', 'type', 'folder', 'tags']
+        shelds = []
+        if shields:
+            for key in embels:
+                x = None
+                if things[key]:
+                    if key == 'isStarred':
+                        shelds.append(customshield(
+                            key, '⭐', color='black', style=options['style']))
 
-    embels = ['isStarred', 'isTrashed',
-              'updatedAt', 'type', 'folder', 'tags']
-    shelds = []
-    if shields:
-        for key in embels:
-            x = None
-            if things[key]:
-                if key == 'isStarred':
-                    shelds.append(customshield(
-                        key, '⭐', color='black', style=options['style']))
-
-                if key == 'isTrashed':
-                    shelds.append(customshield(
-                        key, '🗑', color='black', style=options['style']))
-
-                elif key == 'updatedAt':
-                    shelds.append(customshield(
-                        key, things[key].split(':')[0][:-3].replace('-', '/'), color='green', style=options['style']))
-
-                elif key in ['type', 'folder']:
-                    shelds.append(customshield(
-                        key, things[key], color='blue', style=options['style']))
-
-                elif key == 'tags':
-                    if options['option']:
-                        # OPTION 1: {tag| gay} {tag| notgay}
-                        for tag in things[key]:
-                            shelds.append(
-                                customshield(label='tag', message=tag,
-                                             color='purple', style=options['style'])
-                            )
-                    else:
-                        # OPTION 2: {tag| gay, notgay}
-                        tags = []
-                        for tag in things[key]:
-                            tags.append(tag)
+                    if key == 'isTrashed':
                         shelds.append(customshield(
-                            label='tags', message='_'.join(tags), color='blueviolet', style=options['style']))
+                            key, '🗑', color='black', style=options['style']))
 
-        file = open(os.path.join(location,
-                                 f"{things['title']}.md"), 'w+')
+                    elif key == 'updatedAt':
+                        shelds.append(customshield(
+                            key, things[key].split(':')[0][:-3].replace('-', '/'), color='green', style=options['style']))
 
-        for count, shield in enumerate(shelds):
-            if count != len(shelds) - 1:
-                file.write(shield)
-                file.write(' ')
-            else:
-                file.write(shield)
-                file.write('\n')
+                    elif key in ['type', 'folder']:
+                        shelds.append(customshield(
+                            key, things[key], color='blue', style=options['style']))
+
+                    elif key == 'tags':
+                        if options['option']:
+                            # OPTION 1: {tag| gay} {tag| notgay}
+                            for tag in things[key]:
+                                shelds.append(
+                                    customshield(label='tag', message=tag,
+                                                 color='purple', style=options['style'])
+                                )
+                        else:
+                            # OPTION 2: {tag| gay, notgay}
+                            tags = []
+                            for tag in things[key]:
+                                tags.append(tag)
+                            shelds.append(customshield(
+                                label='tags', message='_'.join(tags), color='blueviolet', style=options['style']))
+
+            file = open(os.path.join(location,
+                                     f"{things['title']}.md"), 'w+')
+
+            for count, shield in enumerate(shelds):
+                if count != len(shelds) - 1:
+                    file.write(shield)
+                    file.write(' ')
+                else:
+                    file.write(shield)
+                    file.write('\n')
 
-        try:
-            file.write(things['content'])
+            try:
+                file.write(things['content'])
 
-        except:
-            pass
-        try:
-            file.write(things['snippets'])
+            except:
+                pass
+            try:
+                file.write(things['snippets'])
 
-        except:
-            pass
+            except:
+                pass
 
 
 def get_changes(
@@ -289,7 +290,7 @@ def get_changes(
     files = []
     os.chdir(location)
     p = subprocess.Popen(
-        git_commands.status, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        "git status", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     for line in p.stdout.readlines():
         # Putting checks to see if any rendered file is deleted.
         if '.md' in line.decode("utf-8"):
@@ -309,7 +310,7 @@ def get_changes(
 def update_changes(
     location=os.path.join(home, 'Boostnote')
 ):
-    create_history(location)
+    # create_history(location)
     changed_files = get_changes()
     history_json = json.load(open(os.path.join(
         location, 'history.json'), 'r'))
@@ -352,16 +353,25 @@ def update_changes(
 def create_history(
     location=os.path.join(home, 'Boostnote')
 ):
-    files = {}
-    for note in get_notes():
-        files[note.split('/')[-1]] = {
-            'title': cson.load(open(note, 'r'))['title'],
-            'updated': False
-        }
-    json.dump(
-        files,
-        open(os.path.join(location, 'history.json'), 'w+')
-    )
+    if os.path.isfile(
+        os.path.join(location, 'history.json')
+    ):
+        # FIle already exists, check for changes.
+        update_changes()
+        print(1)
+
+    else:
+        print(3)
+        files = {}
+        for note in get_notes():
+            files[note.split('/')[-1]] = {
+                'title': cson.load(open(note, 'r'))['title'],
+                'updated': False
+            }
+        json.dump(
+            files,
+            open(os.path.join(location, 'history.json'), 'w+')
+        )
 
 
 def create_readme(config):