diff --git a/skratch.py b/skratch.py index 64f01a8..695b3da 100755 --- a/skratch.py +++ b/skratch.py @@ -11,10 +11,8 @@ def make_dir(d): os.mkdir(d) def delete_all(d): - if not os.path.exists(d): - print("Skratch path doesn't exist") - else: - list_all(d) + fc = list_all(d) + if fc: x = input("Delete the above files? y/N ") if x.lower() == 'y': for file in os.listdir(d): @@ -26,11 +24,14 @@ def delete_all(d): def list_all(d): if not os.path.exists(d): print("Skratch path doesn't exist") - elif os.listdir(d) == []: + return 0 + files = os.listdir(d) + if files == []: print("No skratch files exist") else: - for file in os.listdir(d): + for file in files: print(file) + return len(files) def get_editor(use_v): v = os.getenv("VISUAL")