From 11e1dbc0cb8e36ee1aa287b225663177cf8c0726 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sat, 27 Apr 2019 13:20:27 +0200 Subject: [PATCH 1/5] Ignore stale directories --- script/hassfest/model.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 059231cf95465e..59c7cd297f3a5b 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -46,6 +46,9 @@ def load_dir(cls, path: pathlib.Path): if fil.is_file() or fil.name == '__pycache__': continue + if not (fil / '__init__.py').exists(): + continue + integration = cls(fil) integration.load_manifest() integrations[integration.domain] = integration From 64ab47245ccebe27b93e7da4e9205ec58ea6d001 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sat, 27 Apr 2019 13:44:13 +0200 Subject: [PATCH 2/5] Remove redundant tests --- script/hassfest/model.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 59c7cd297f3a5b..85727be2a550d0 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -43,9 +43,6 @@ def load_dir(cls, path: pathlib.Path): assert path.is_dir() integrations = {} for fil in path.iterdir(): - if fil.is_file() or fil.name == '__pycache__': - continue - if not (fil / '__init__.py').exists(): continue From 26fd0fc7ab63b8c6739b1066df0b12b0c924a126 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sun, 28 Apr 2019 10:12:51 +0200 Subject: [PATCH 3/5] Revert "Remove redundant tests" --- script/hassfest/model.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 85727be2a550d0..59c7cd297f3a5b 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -43,6 +43,9 @@ def load_dir(cls, path: pathlib.Path): assert path.is_dir() integrations = {} for fil in path.iterdir(): + if fil.is_file() or fil.name == '__pycache__': + continue + if not (fil / '__init__.py').exists(): continue From 25381332e67ed4c1d4d8d40bec93347991836f8f Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sun, 28 Apr 2019 10:13:14 +0200 Subject: [PATCH 4/5] Print warning when skipping directories --- script/hassfest/model.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 59c7cd297f3a5b..48a562baf7b1ef 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -46,7 +46,9 @@ def load_dir(cls, path: pathlib.Path): if fil.is_file() or fil.name == '__pycache__': continue - if not (fil / '__init__.py').exists(): + init = fil / '__init__.py' + if not init.exists(): + print("Warning: {} missing, skipping directory".format(init)) continue integration = cls(fil) From 11261076722826e153cea873afdf5a5fcd618e59 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sun, 28 Apr 2019 21:14:17 +0200 Subject: [PATCH 5/5] Suggest to remove stale directory --- script/hassfest/model.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 48a562baf7b1ef..de2527159924d2 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -48,7 +48,9 @@ def load_dir(cls, path: pathlib.Path): init = fil / '__init__.py' if not init.exists(): - print("Warning: {} missing, skipping directory".format(init)) + print("Warning: {} missing, skipping directory. " + "If this is your development environment, " + "you can safely delete this folder.".format(init)) continue integration = cls(fil)