Clear out many archaic scripts and fix several others.

sligocki · Jun 9, 2021 · b5d59eb · b5d59eb
1 parent 83757df
commit b5d59eb
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 237 deletions.
diff --git a/complete_ancestors.py b/complete_ancestors.py
@@ -7,9 +7,10 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument("start_id")
+parser.add_argument("--version", help="Data version (defaults to most recent).")
 args = parser.parse_args()
 
-db = data_reader.Database()
+db = data_reader.Database(args.version)
 
 start_num = db.id2num(args.start_id)
 for ahn, ancestor in enum_kin.enum_ancestors(db, start_num):

diff --git a/connection_core.py b/connection_core.py
@@ -9,7 +9,8 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument("wikitree_id")
-parser.add_argument("--graph", default="data/nuclear.core.adj.nx")
+parser.add_argument("--version", help="Data version (defaults to most recent).")
+parser.add_argument("--graph", default="data/version/default/nuclear.core.adj.nx")
 parser.add_argument("--plot", action="store_true",
                     help="Produce a DOT plot of connections.")
 parser.add_argument("--distance-only", action="store_true",
@@ -30,7 +31,7 @@
       # Ignore non integer "person" values. Ex: "Parent"
       pass
 
-db = data_reader.Database()
+db = data_reader.Database(args.version)
 print(f"Connections from {args.wikitree_id} to core (size {len(core_people):,})", time.process_time())
 connections = connection.find_connections_group(
   db=db, start=db.id2num(args.wikitree_id), group=core_people)

diff --git a/count_descendants.py b/count_descendants.py
diff --git a/count_descendants_per_ancestor.py b/count_descendants_per_ancestor.py
@@ -37,13 +37,14 @@ def descendants_per_ancestor(db, start_num, args):
 if __name__ == "__main__":
   parser = argparse.ArgumentParser()
   parser.add_argument("wikitree_id")
+  parser.add_argument("--version", help="Data version (defaults to most recent).")
   parser.add_argument("--ignore-my-line", action="store_true")
   parser.add_argument("--print-all", action="store_true")
   parser.add_argument("--num-gens", type=int,
                       help="Restrict num gens to look down")
   args = parser.parse_args()
 
-  db = data_reader.Database()
+  db = data_reader.Database(args.version)
   start_num = db.id2num(args.wikitree_id)
 
   descendants_per_ancestor(db, start_num, args)
diff --git a/data_reader.py b/data_reader.py
@@ -61,7 +61,7 @@ def neighbors_of(self, person):
       return super(Database, self).neighbors_of(person)
 
   def load_connections(self):
-    self.connections = load_connections(version=args.version,
+    self.connections = load_connections(version=self.version,
                                         include_parents=True,
                                         include_children=True,
                                         include_siblings=True,

diff --git a/distances.py b/distances.py
@@ -49,12 +49,13 @@ def enum_user_nums(db, args):
 
 if __name__ == "__main__":
   parser = argparse.ArgumentParser()
+  parser.add_argument("--version", help="Data version (defaults to most recent).")
   parser.add_argument("--random", action="store_true")
   parser.add_argument("--save-distribution-json", help="Save Circle sizes to file.")
   parser.add_argument("wikitree_id", nargs="*")
   args = parser.parse_args()
 
-  db = data_reader.Database()
+  db = data_reader.Database(args.version)
   db.load_connections()
 
   circle_sizes = {}

diff --git a/hist_grandchildren.py b/hist_grandchildren.py
diff --git a/load_edges.py b/load_edges.py
diff --git a/load_graph.py b/load_graph.py
diff --git a/missing_people.py b/missing_people.py
@@ -10,11 +10,12 @@
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument("dna_connections_file"
+parser.add_argument("dna_connections_file",
                     help="Response to an API request: api.php?action=getConnectedProfilesByDNATest&key=<person>&dna_id=<id>")
+parser.add_argument("--version", help="Data version (defaults to most recent).")
 args = parser.parse_args()
 
-db = data_reader.Database()
+db = data_reader.Database(args.version)
 
 with open(args.dna_connections_file) as f:
   results = json.load(f)

diff --git a/rewrite_custom.py b/rewrite_custom.py
diff --git a/sibling_in_laws.py b/sibling_in_laws.py
diff --git a/sqlite_reader.py b/sqlite_reader.py
@@ -26,7 +26,8 @@ def get_person_num(self, id_or_num):
     try:
       return int(id_or_num)
     except ValueError:
-      return self.id2num(id_or_num)
+      pass
+    return self.id2num(id_or_num)
 
   def id2num(self, wikitree_id):
     self.cursor.execute("SELECT user_num FROM people WHERE wikitree_id=?", (wikitree_id,))