Support \input and \subimport

mlq · mlq · commit a98726f98393 · 2021-05-05T20:08:21.000+02:00
diff --git a/client.py b/client.py
@@ -37,13 +37,28 @@
 if server[-1] != '/': server += "/"
 if not server.endswith("/v1/"): server += "/v1/"
 
-def get_keys():
-    content = open(args.tex).read()
+def get_keys(filename, import_base=None):
+    content = open(filename).read()
+
+    # extract cites
     keys = set()
     cites = re.findall("\\\\citeA?\\{([^\\}]+)\\}", content)
     for key in cites:
         keys |= set(key.split(","))
 
+    # find inputs and recursively parse them
+    inputs = re.findall("\\\\input\\{([^\\}]+)\\}", content)
+    for f in inputs:
+        if import_base is not None:
+            f = os.path.join(import_base, f)
+        keys |= set(get_keys(f))
+
+    # find subimports and recursively parse them
+    subimports = re.findall("\\\\subimport\*?\\{(.*)\\}\\{(.*)\\}", content)
+    for f in subimports:
+        filepath = os.path.join(f[0], f[1])
+        keys |= set(get_keys(filepath, import_base=f[0]))
+
     keys = sorted(list([k.strip() for k in keys]))
     return keys
 
@@ -71,8 +86,8 @@ def bib_has_changed(bib):
         pass
     save_bib_hash()
     return (new_bib != old_bib)
-    
-        
+
+
 def entry_by_key(key):
     for entry in bib_database.entries:
         if entry["ID"] == key:
@@ -84,8 +99,8 @@ def entry_to_bibtex(entry):
     newdb = bibtexparser.bibdatabase.BibDatabase()
     newdb.entries = [ entry ]
     return bibtexparser.dumps(newdb)
-    
-    
+
+
 def inline_diff(a, b):
     matcher = difflib.SequenceMatcher(None, a, b)
     def process_tag(tag, i1, i2, j1, j2):
@@ -136,51 +151,51 @@ def update_local_bib(key, new_entry):
         if entry["ID"] == key:
             bib_database.entries[idx] = new_entry
             break
-                
-                
+
+
 def update_remote_bib(key, new_entry):
     response = requests.put(server + "entry/%s" % key, json = {"entry": new_entry, "token": token})
     if "success" in response.json() and not response.json()["success"]:
         show_error(response.json())
 
-def add_remote_bib(key, entry):    
+def add_remote_bib(key, entry):
     response = requests.post(server + "entry/%s" % key, json = {"entry": entry, "token": token})
     if "success" in response.json() and not response.json()["success"]:
-        show_error(response.json())    
-    
+        show_error(response.json())
+
 def remove_remote_bib(key):
     response = requests.delete(server + "entry/%s%s" % (key, "/%s" % token if token else ""))
     if "success" in response.json() and not response.json()["success"]:
         show_error(response.json())
-    
+
 
 def remove_local_bib(key):
     for (idx, entry) in enumerate(bib_database.entries):
         if entry["ID"] == key:
             del bib_database.entries[idx]
             save_bib()
-            
+
 
 def save_bib_hash():
     try:
         bib = open("main.bib").read()
         open("main.bib.sha", "w").write(hashlib.sha256(bib.strip().encode("utf-8")).hexdigest())
-    except: 
+    except:
         pass
 
-                
+
 def save_bib():
     with open('main.bib', 'w') as bibtex_file:
         bibtexparser.dump(bib_database, bibtex_file)
     save_bib_hash()
-            
+
 
 def show_error(obj):
     if "reason" in obj:
         if obj["reason"] == "access_denied":
             print("[!] Access denied! Your token is not valid for this operation. Verify whether the file '%s' contains a valid token." % args.token_file)
-            
-    
+
+
 action = args.action
 
 parser = BibTexParser(common_strings=True)
@@ -208,29 +223,29 @@ def show_error(obj):
         sc.write(script.text)
     print("Restarting...")
     os.execl(sys.executable, *([sys.executable]+sys.argv))
-    
+
 
 if action == "search":
     if len(args.query) < 3:
         print("Usage: %s search --query <query>" % sys.argv[0])
         sys.exit(1)
     response = requests.get(server + "search/" + args.query + ("/%s" % token if token else ""))
     print(response.text)
-    
+
 elif action == "sync":
     response = requests.get(server + "sync")
     print(response.text)
 
 elif action == "get":
-    keys = get_keys()
+    keys = get_keys(args.tex)
     fetch = keys_have_changed(keys)
     try:
         current_bib = open("main.bib").read()
         update = bib_has_changed(current_bib)
     except:
         update = False
         fetch = True
-        
+
     if update:
         fetch = True
     if not limit_traffic:
@@ -255,7 +270,7 @@ def show_error(obj):
                     print(remote)
                     print("- Diff - ")
                     print(inline_diff(remote, local))
-                    
+
                     if dup[1] != dup[2]["ID"]:
                         # different key, similar entry
                         action = resolve_duplicate()
@@ -283,7 +298,7 @@ def show_error(obj):
                             update_remote_bib(dup[2]["ID"], entry_by_key(dup[1]))
             else:
                 show_error(result)
-                
+
     if fetch:
         response = requests.post(server + "get_json", json = {"entries": keys, "token": token})
         bib = response.json()
@@ -295,7 +310,7 @@ def show_error(obj):
                 if entry and "ID" in entry and not entry_by_key(entry["ID"]):
                     bib_database.entries.append(entry)
             save_bib()
-            
+
             # suggest keys for unresolved keys
             for key in keys:
                 if not entry_by_key(key):
