.gitignore

@@ -1,8 +0,0 @@
-
-.cat.pkl
-.DS_Store
-Data/mailbox-13a.csv
-Data/mailbox-14.csv
-Data/users-13a.csv
-Data/users-14.csv
-namen.txt

WordList.txt

@@ -1,178 +0,0 @@
-Abend
-Abendrot
-Aldebaran
-Allianz
-Analyse
-Angebot
-Antwort
-Aufgabe
-Auftakt
-Augenstern
-Augenweide
-Ausgleich
-Bahnhof
-Basis
-Bedeutung
-Begegnung
-Beispiel
-Beitrag
-Beratung
-Berufung
-Bewegung
-Blickfang
-Butterblume
-Borgelicht
-Chance
-Charakter
-Chiffon
-Denken
-Dialog
-Dutzend
-Ebene
-Einheit
-Einigung
-Energie
-Farbe
-Farbenfroh
-Fernweh
-Feuervogel
-Firlefanz
-Firmament
-Forschung
-Freiheit
-Freude
-Frieden
-Fusion
-Galerie
-Garten
-Gedanke
-Gedanken
-Gegenwart
-Geist
-Gestalt
-Haltung
-Heimat
-Heimelig
-Herbst
-Herzlich
-Himmel
-Himmelsblau
-Hoffnung
-Insel
-Interesse
-Jahrzehnt
-Jenseits
-Joghurt
-Jubel
-Kamera
-Karte
-Kenntnis
-Kleinod
-Konzert
-Kraft
-Kultur
-Kunst
-Labsal
-Lebenslust
-Lehre
-Libelle
-Licht
-Lichtblick
-Lichtspiel
-Liebe
-Literatur
-Lobhudeln
-Luftikus
-Luftschlange
-Luftschloss
-Medium
-Meister
-Mondschein
-Morgenstern
-Morgentau
-Mummenschanz
-Museum
-Nachbar
-Nacht
-Naschkatze
-Naseweis
-Natur
-Nordstern
-Ofenwarm
-Ohrenschmaus
-Ohrwurm
-Ordnung
-Ostwind
-Pflege
-Plauderei
-Prinzip
-Purzelbaum
-Pusteblume
-Pustekuchen
-Quasar
-Quelle
-Quitte
-Rebell
-Reform
-Regenbogen
-Richtung
-Runde
-Sammlung
-Samtpfote
-Sandkasten
-Sandstein
-Saumselig
-Schatten
-Schlummern
-Schmollmund
-Schutz
-Seele
-Sektlaune
-Sommer
-Sommerfrische
-Sonne
-Sperenzchen
-Spiegel
-Spielen
-Sprache
-Steckenpferd
-Sternenzelt
-Sternschnuppe
-Sternstunde
-Stimmung
-Stubentiger
-Szene
-Tagtraum
-Teilhabe
-Tendenz
-Theater
-Tollpatsch
-Tradition
-Traum
-Ukulele
-Umwelt
-Unsinn
-Variante
-Vertrauen
-Vollmond
-Vorfreude
-Vorschlag
-Waffel
-Wahrheit
-Wanderlust
-Wildwasser
-Wintertag
-Wissen
-Wundervoll
-Wunschtraum
-Xenon
-Xenophil
-Xylophon
-Yacht
-Yttrium
-Yucca
-Zeichen
-Zeitlos
-Zeitpunkt
-Zeitraum
-Zwielicht

generateUserlist.py

@@ -1,62 +1,38 @@
-# Generate Userlist
+# Generate import file
-# 
-# Rev 1.1, 10/22/22
-#    - changed the -y (year of enrolement) parameter to a more general -s (suffix)
-#    - updated the usage message to include that change
-#    - added a lot of comments, especially regarding the default values
-#    - removed the unused fileinput import
-#    - changed the defaults to fit more common scenarios
-# Rev 1.0, 10/20/22
-#    - a simple script to generate CSV-files suitable as input
-#      for the importUsers script.
-#    - this script is rather specifically designed to accomodate
-#      the needs of our school's user naming scheme. Different
-#      naming schemes should be easy to implement though.
-#    - the script generates default passwords by picking three
-#      words from a file called WordList.txt living in the same
-#      directory as the script file.
-#  Options
-#    -d,--domain: domain name for the email address, this is required
-#    -g,--groups: comma-separated list of groups added to every user
-#    -s,--suffix: added to every username and the resulting filename
-#     in this release, the suffix is added to the last group name as well
-#    -f,--file: file of usernames, first and last name separated by comma
 
 import sys, getopt
 import csv
 import os,io
+import fileinput
 import random
 
 def main(argv):
 	wordList = open("WordList.txt").read().splitlines()
-	# add some default values for the options
+	groups = "Schueler"
-	groups = "Users" 			# add default groups for all imports here
+	yoe = "00"
-	suffix = ""
+	domainname="hd.waldorf.one"
-	domainname="example.com"
 	filename = "names.csv"
-	# next is a list of characters common in users actual names but unsuitable for login names
-	# for this script, those are specific to german names. Spaces get replaced with dashes.
-	char_map = {ord("ä"):"ae", ord("ü"):"ue", ord("ö"):"oe", ord("ß"):"ss", ord(" "):"-"}
 	
 	try:
-		opts, args = getopt.getopt(argv,"hg:d:s:f:",["help","groups=","domain=","suffix=","file="])
+		opts, args = getopt.getopt(argv,"hg:d:y:f:",["help","groups=","domain=","year=","file="])
 	except getopt.GetoptError:
-		print("Usage: importUsers.py -d <domainname> [-g <groups>] [-s <common suffix for this import]> -f <datafile>")
+		print("Usage: importUsers.py -d <domainname> [-g <groups>] [-y <year of enrollment]> -f <datafile>")
 		sys.exit(2)
 	for opt, arg in opts:
 		if opt == '-h':
-			print("Usage: importUsers.py -d <domainname> [-g <groups>] -s <common suffix for this import> -f <datafile> ")
+			print("Usage: importUsers.py -d <domainname> [-g <groups>] -y <year of enrollment> -f <datafile> ")
 		elif opt in ('-d', '--domain'):
 			domainname = arg
 		elif opt in ('-g', '--groups'):
-			groups = groups + "," + arg		# as per importUsers specs, the groups are comma-separated
+			groups = groups + "," + arg
 		elif opt in ('-f', '--file'):
 			filename = arg
-		elif opt in ('-s', '--suffix'):
+		elif opt in ('-y', '--year'):
-			suffix = arg
+			yoe = arg
-			groups = groups + suffix
+			groups = groups + ",schueler-hd-" + yoe
 
-	outputFileName = "users" + suffix + ".csv"
+	outputFileName = "users_" + yoe + ".csv"
+	char_map = {ord("ä"):"ae", ord("ü"):"ue", ord("ö"):"oe", ord("ß"):"ss", ord(" "):"-"}
 	with open(outputFileName,"w+",newline='') as outputFile:
 		header = ["first_name","last_name","email_address","sis_username","user_groups","password"]
 		writer = csv.DictWriter(outputFile,fieldnames=header,delimiter=";", quoting=csv.QUOTE_MINIMAL)
@@ -64,9 +40,9 @@ def main(argv):
 		users = open(filename,"r").read().splitlines()
 		for user in users:
 			first_name,last_name = tuple(user.split(","))
-			username = first_name.casefold().translate(char_map) + "." + last_name.casefold().translate(char_map) + suffix
+			username = first_name.casefold().translate(char_map) + "." + last_name.casefold().translate(char_map) + "-" + yoe
 			address = username + "@" + domainname
-			password = "-".join(random.sample(wordList,3))		# pick three words at ramdom, join them with a dash
+			password = "-".join(random.sample(wordList,3))
 			writer.writerow({"first_name":first_name,"last_name":last_name,"email_address":address,"sis_username":username,"user_groups":groups,"password":password})
 	
 if __name__ == "__main__":