diff --git a/TITLE b/TITLE new file mode 100644 index 0000000..f7d7fd7 --- /dev/null +++ b/TITLE @@ -0,0 +1 @@ +[init] Discover Rougail diff --git a/build.py b/build.py index 97c9eab..6cb7b23 100755 --- a/build.py +++ b/build.py @@ -7,8 +7,8 @@ from ansi2html import Ansi2HTMLConverter from rougail import Rougail from rougail.config import get_rougail_config -from rougail.output_exporter import RougailOutputExporter -from rougail.user_data_file import RougailUserDataFile +from rougail.output_console import RougailOutputConsole +from rougail.user_data_yaml import RougailUserDataYaml from rougail.output_doc import RougailOutputDoc @@ -16,8 +16,8 @@ if __name__ == "__main__": version = sys.argv[1] # rougailconfig = RougailConfig.copy() rougailconfig = get_rougail_config(backward_compatibility=False, add_extra_options=False) - rougailconfig['main_dictionaries'] = ['firefox'] - rougailconfig['default_dictionary_format_version'] = version + rougailconfig['main_structural_directories'] = ['firefox'] + rougailconfig['default_structural_format_version'] = version if Path('config/namespace').is_file(): has_namespace = True has_foxyproxy = False @@ -25,26 +25,26 @@ if __name__ == "__main__": has_foxyproxy = True has_namespace = True rougailconfig['main_namespace'] = 'Firefox' - rougailconfig['extra_dictionaries'] = {'FoxyProxy': ['foxyproxy']} + rougailconfig['extra_namespaces'] = {'FoxyProxy': ['foxyproxy']} else: has_foxyproxy = False has_namespace = False rougailconfig['main_namespace'] = None # rougailconfig['tiramisu_cache'] = "cache.py" -# rougail = Rougail(rougailconfig) -# config = rougail.get_config() -# print(config.value.get()) - rougailconfig['step.output'] = 'doc' - rougailconfig['doc.output_format'] = 'github' - rougailconfig['doc.title_level'] = 3 if Path('mode').is_file(): rougailconfig['modes_level'] = ['basic', 'standard', 'advanced'] has_mode = True else: has_mode = False - inventory = RougailOutputDoc(rougailconfig=rougailconfig.copy()) - rougailconfig['step.output'] = 'exporter' - header = inventory.formater.header() + rougail = Rougail(rougailconfig) + config = rougail.run() +# print(config.value.get()) + rougailconfig['step.output'] = 'doc' + rougailconfig['doc.output_format'] = 'github' + rougailconfig['doc.title_level'] = 3 + inventory = RougailOutputDoc(config, rougailconfig=rougailconfig.copy()) + inventory.load_formatter() + rougailconfig['step.output'] = 'console' summary = Path('summary_before.md') if summary.is_file(): with summary.open('r') as sfh: @@ -55,32 +55,36 @@ if __name__ == "__main__": namespace = 'firefox' file_found = False if rougailconfig['main_namespace']: - all_dirs = [[rougailconfig['main_dictionaries']], rougailconfig['extra_dictionaries'].values()] + all_dirs = [[rougailconfig['main_structural_directories']], [['foxyproxy']]] else: - all_dirs = [[rougailconfig['main_dictionaries']]] + all_dirs = [[rougailconfig['main_structural_directories']]] - doc += inventory.formater.title('Screenshot', 2) + '\n' + doc += inventory.formatter.title('Screenshot', 2) + '\n' doc += f'{namespace.capitalize()} Proxy setting\n\n' # with doc_file.open('r') as docfh: # doc += docfh.read() - doc += '\n' + inventory.formater.title('Structure', 2) + '\n' + doc += '\n' + inventory.formatter.title('Structure', 2) + '\n' + print(all_dirs) for r in all_dirs: for dirs in r: for d in dirs: + print(d) files = list(Path(d).iterdir()) files.sort() for f in files: namespace = f.parent.name file_found = True if f.name.endswith('.yml') or f.name.endswith('.yaml'): - doc += inventory.formater.title(str(f), 3) + doc += inventory.formatter.title(str(f), 3) doc += '\n```yml\n' with f.open(encoding="utf8") as file_fh: doc += file_fh.read() doc += '\n```\n' - inv_doc = inventory.gen_doc() + rougailconfig['step.output'] = 'doc' + inv_doc = inventory.run()[1] + rougailconfig['step.output'] = 'console' if file_found and inv_doc: - doc += inventory.formater.title('Generated documentation', 3) + doc += inventory.formatter.title('Generated documentation', 3) CMD = f"foo@bar:~$ rougail -v {version} -m firefox/ " if has_namespace: CMD += "-s Firefox " @@ -94,7 +98,7 @@ if __name__ == "__main__": # config = Path('config') if config.is_dir(): - doc += inventory.formater.title('User data', 2) + doc += inventory.formatter.title('User data', 2) configs = list(config.iterdir()) configs.sort() for idx, dirname in enumerate(configs): @@ -102,58 +106,54 @@ if __name__ == "__main__": continue for filename in dirname.iterdir(): if filename.name.endswith('.yml') or filename.name.endswith('.yaml'): - doc += inventory.formater.title(f'Example {idx + 1}', 3) - doc += inventory.formater.title(str(filename), 4) + doc += inventory.formatter.title(f'Example {idx + 1}', 3) + doc += inventory.formatter.title(str(filename), 4) doc += '\n```yml\n' with filename.open(encoding="utf8") as file_fh: doc += file_fh.read() doc += '\n```\n' # with filename.open(encoding="utf8") as file_fh: # objects = yaml.load(file_fh) -# doc += inventory.formater.yaml(objects) +# doc += inventory.formatter.yaml(objects) #readme = dirname / 'README.md' #if readme.is_file(): - # doc += inventory.formater.title('Description', 4) + # doc += inventory.formatter.title('Description', 4) # with readme.open() as fh: # doc += fh.read() + '\n\n' rougail = Rougail(rougailconfig) - tiramisu_config = rougail.get_config() - rougailconfig['step.user_data'] = ['file'] - rougailconfig['file.filename'] = [str(filename.absolute())] - data = RougailUserDataFile(tiramisu_config, rougailconfig=rougailconfig) + tiramisu_config = rougail.run() + rougailconfig['step.user_data'] = ['yaml'] + rougailconfig['yaml.filename'] = [str(filename.absolute())] + data = RougailUserDataYaml(tiramisu_config, rougailconfig=rougailconfig) ret = data.run() errors = rougail.user_datas(ret) - export = RougailOutputExporter(tiramisu_config, - rougailconfig=rougailconfig, - user_data_errors=errors['errors'], - user_data_warnings=errors['warnings'], - ) - export.exporter() - with export.formater.console.capture() as capture: - export.print() + export = RougailOutputConsole(tiramisu_config, + rougailconfig=rougailconfig, + user_data_errors=errors['errors'], + user_data_warnings=errors['warnings'], + ) + console = export.run()[1] conv = Ansi2HTMLConverter(inline=True) - doc += inventory.formater.title('Output', 4) - cmd = CMD + f"-u file -ff {filename}" + doc += inventory.formatter.title('Output', 4) + cmd = CMD + f"-u yaml -ff {filename}" doc += f"```console\n{cmd}\n```\n" - conv_data = '
' + conv.convert(capture.get(), full=False) + "
\n" + conv_data = '
' + conv.convert(console, full=False) + "
\n" doc += conv_data with open(dirname / 'output_ro.html', 'w') as fh_output: fh_output.write(conv_data) if (config / 'read_write').is_file(): - rougailconfig['exporter.read_write'] = True - export = RougailOutputExporter(tiramisu_config, - rougailconfig=rougailconfig, - user_data_errors=data.errors, - user_data_warnings=data.warnings, - ) - export.exporter() - with export.formater.console.capture() as capture: - export.print() + tiramisu_config.property.read_write + export = RougailOutputConsole(tiramisu_config, + rougailconfig=rougailconfig, + user_data_errors=data.errors, + user_data_warnings=data.warnings, + ) + console = export.run()[1] conv = Ansi2HTMLConverter(inline=True) - doc += inventory.formater.title('Output in read write mode', 4) - cmd = cmd + " --exporter.read_write" + doc += inventory.formatter.title('Output in read write mode', 4) + cmd = cmd + " --cli.read_write" doc += f"```console\n{cmd}\n```\n" - conv_data = '
' + conv.convert(capture.get(), full=False) + "
\n" + conv_data = '
' + conv.convert(console, full=False) + "
\n" doc += '
' + conv_data + "
\n" with open(dirname / 'output_rw.html', 'w') as fh_output: fh_output.write(conv_data) diff --git a/build.sh b/build.sh index ed95bb1..66cf648 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,7 @@ for i in $(ls -d "examples"/* | sort); do diff_url="https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/${commit_id}~1..$commit_id" echo " - [$summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/$commit_id/README.md) ([diff]($diff_url))" >> summary.md cp "summary_total.md" "$DEST" - cd "$i/dictionaries" + cd "$i/structural_files" if [ -d firefox ]; then for j in $(ls firefox/*.yml 2>/dev/null); do cp "$j" "$DEST/$j" diff --git a/examples/000/dictionaries/firefox/00-proxy.yml b/examples/000/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/000/dictionaries/firefox/00-proxy.yml rename to examples/000/structural_files/firefox/00-proxy.yml diff --git a/examples/001/dictionaries/firefox/00-proxy.yml b/examples/001/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/001/dictionaries/firefox/00-proxy.yml rename to examples/001/structural_files/firefox/00-proxy.yml diff --git a/examples/010/dictionaries/firefox/00-proxy.yml b/examples/010/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/010/dictionaries/firefox/00-proxy.yml rename to examples/010/structural_files/firefox/00-proxy.yml diff --git a/examples/011/dictionaries/firefox/00-proxy.yml b/examples/011/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/011/dictionaries/firefox/00-proxy.yml rename to examples/011/structural_files/firefox/00-proxy.yml diff --git a/examples/012/dictionaries/firefox/00-proxy.yml b/examples/012/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/012/dictionaries/firefox/00-proxy.yml rename to examples/012/structural_files/firefox/00-proxy.yml diff --git a/examples/013/dictionaries/firefox/00-proxy.yml b/examples/013/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/013/dictionaries/firefox/00-proxy.yml rename to examples/013/structural_files/firefox/00-proxy.yml diff --git a/examples/014/dictionaries/firefox/00-proxy.yml b/examples/014/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/014/dictionaries/firefox/00-proxy.yml rename to examples/014/structural_files/firefox/00-proxy.yml diff --git a/examples/020/dictionaries/firefox/10-manual.yml b/examples/020/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/020/dictionaries/firefox/10-manual.yml rename to examples/020/structural_files/firefox/10-manual.yml diff --git a/examples/021/dictionaries/firefox/10-manual.yml b/examples/021/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/021/dictionaries/firefox/10-manual.yml rename to examples/021/structural_files/firefox/10-manual.yml diff --git a/examples/022/dictionaries/firefox/10-manual.yml b/examples/022/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/022/dictionaries/firefox/10-manual.yml rename to examples/022/structural_files/firefox/10-manual.yml diff --git a/examples/023/dictionaries/firefox/10-manual.yml b/examples/023/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/023/dictionaries/firefox/10-manual.yml rename to examples/023/structural_files/firefox/10-manual.yml diff --git a/examples/024/dictionaries/firefox/10-manual.yml b/examples/024/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/024/dictionaries/firefox/10-manual.yml rename to examples/024/structural_files/firefox/10-manual.yml diff --git a/examples/025/dictionaries/firefox/10-manual.yml b/examples/025/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/025/dictionaries/firefox/10-manual.yml rename to examples/025/structural_files/firefox/10-manual.yml diff --git a/examples/026/dictionaries/firefox/10-manual.yml b/examples/026/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/026/dictionaries/firefox/10-manual.yml rename to examples/026/structural_files/firefox/10-manual.yml diff --git a/examples/027/dictionaries/firefox/10-manual.yml b/examples/027/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/027/dictionaries/firefox/10-manual.yml rename to examples/027/structural_files/firefox/10-manual.yml diff --git a/examples/028/dictionaries/firefox/10-manual.yml b/examples/028/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/028/dictionaries/firefox/10-manual.yml rename to examples/028/structural_files/firefox/10-manual.yml diff --git a/examples/029/dictionaries/firefox/10-manual.yml b/examples/029/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/029/dictionaries/firefox/10-manual.yml rename to examples/029/structural_files/firefox/10-manual.yml diff --git a/examples/030/dictionaries/firefox/20-manual.yml b/examples/030/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/030/dictionaries/firefox/20-manual.yml rename to examples/030/structural_files/firefox/20-manual.yml diff --git a/examples/031/dictionaries/firefox/20-manual.yml b/examples/031/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/031/dictionaries/firefox/20-manual.yml rename to examples/031/structural_files/firefox/20-manual.yml diff --git a/examples/032/dictionaries/firefox/20-manual.yml b/examples/032/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/032/dictionaries/firefox/20-manual.yml rename to examples/032/structural_files/firefox/20-manual.yml diff --git a/examples/033/dictionaries/firefox/20-manual.yml b/examples/033/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/033/dictionaries/firefox/20-manual.yml rename to examples/033/structural_files/firefox/20-manual.yml diff --git a/examples/034/dictionaries/firefox/20-manual.yml b/examples/034/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/034/dictionaries/firefox/20-manual.yml rename to examples/034/structural_files/firefox/20-manual.yml diff --git a/examples/035/dictionaries/firefox/20-manual.yml b/examples/035/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/035/dictionaries/firefox/20-manual.yml rename to examples/035/structural_files/firefox/20-manual.yml diff --git a/examples/036/dictionaries/firefox/20-manual.yml b/examples/036/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/036/dictionaries/firefox/20-manual.yml rename to examples/036/structural_files/firefox/20-manual.yml diff --git a/examples/040/dictionaries/firefox/20-manual.yml b/examples/040/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/040/dictionaries/firefox/20-manual.yml rename to examples/040/structural_files/firefox/20-manual.yml diff --git a/examples/041/dictionaries/firefox/20-manual.yml b/examples/041/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/041/dictionaries/firefox/20-manual.yml rename to examples/041/structural_files/firefox/20-manual.yml diff --git a/examples/042/dictionaries/firefox/20-manual.yml b/examples/042/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/042/dictionaries/firefox/20-manual.yml rename to examples/042/structural_files/firefox/20-manual.yml diff --git a/examples/043/dictionaries/firefox/20-manual.yml b/examples/043/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/043/dictionaries/firefox/20-manual.yml rename to examples/043/structural_files/firefox/20-manual.yml diff --git a/examples/044/dictionaries/firefox/20-manual.yml b/examples/044/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/044/dictionaries/firefox/20-manual.yml rename to examples/044/structural_files/firefox/20-manual.yml diff --git a/examples/050/dictionaries/firefox/10-manual.yml b/examples/050/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/050/dictionaries/firefox/10-manual.yml rename to examples/050/structural_files/firefox/10-manual.yml diff --git a/examples/051/dictionaries/firefox/20-manual.yml b/examples/051/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/051/dictionaries/firefox/20-manual.yml rename to examples/051/structural_files/firefox/20-manual.yml diff --git a/examples/060/dictionaries/firefox/30-auto.yml b/examples/060/structural_files/firefox/30-auto.yml similarity index 100% rename from examples/060/dictionaries/firefox/30-auto.yml rename to examples/060/structural_files/firefox/30-auto.yml diff --git a/examples/061/dictionaries/firefox/30-auto.yml b/examples/061/structural_files/firefox/30-auto.yml similarity index 100% rename from examples/061/dictionaries/firefox/30-auto.yml rename to examples/061/structural_files/firefox/30-auto.yml diff --git a/examples/070/dictionaries/firefox/40-no_proxy.yml b/examples/070/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/070/dictionaries/firefox/40-no_proxy.yml rename to examples/070/structural_files/firefox/40-no_proxy.yml diff --git a/examples/071/dictionaries/firefox/40-no_proxy.yml b/examples/071/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/071/dictionaries/firefox/40-no_proxy.yml rename to examples/071/structural_files/firefox/40-no_proxy.yml diff --git a/examples/072/dictionaries/firefox/40-no_proxy.yml b/examples/072/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/072/dictionaries/firefox/40-no_proxy.yml rename to examples/072/structural_files/firefox/40-no_proxy.yml diff --git a/examples/073/dictionaries/firefox/40-no_proxy.yml b/examples/073/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/073/dictionaries/firefox/40-no_proxy.yml rename to examples/073/structural_files/firefox/40-no_proxy.yml diff --git a/examples/074/dictionaries/firefox/40-no_proxy.yml b/examples/074/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/074/dictionaries/firefox/40-no_proxy.yml rename to examples/074/structural_files/firefox/40-no_proxy.yml diff --git a/examples/075/dictionaries/firefox/50-prompt_authentication.yml b/examples/075/structural_files/firefox/50-prompt_authentication.yml similarity index 100% rename from examples/075/dictionaries/firefox/50-prompt_authentication.yml rename to examples/075/structural_files/firefox/50-prompt_authentication.yml diff --git a/examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/076/structural_files/firefox/55-proxy_dns_socks5.yml similarity index 100% rename from examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml rename to examples/076/structural_files/firefox/55-proxy_dns_socks5.yml diff --git a/examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/077/structural_files/firefox/55-proxy_dns_socks5.yml similarity index 100% rename from examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml rename to examples/077/structural_files/firefox/55-proxy_dns_socks5.yml diff --git a/examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/078/structural_files/firefox/55-proxy_dns_socks5.yml similarity index 100% rename from examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml rename to examples/078/structural_files/firefox/55-proxy_dns_socks5.yml diff --git a/examples/080/dictionaries/firefox/60-dns_over_https.yml b/examples/080/structural_files/firefox/60-dns_over_https.yml similarity index 100% rename from examples/080/dictionaries/firefox/60-dns_over_https.yml rename to examples/080/structural_files/firefox/60-dns_over_https.yml diff --git a/examples/081/dictionaries/firefox/60-dns_over_https.yml b/examples/081/structural_files/firefox/60-dns_over_https.yml similarity index 100% rename from examples/081/dictionaries/firefox/60-dns_over_https.yml rename to examples/081/structural_files/firefox/60-dns_over_https.yml diff --git a/examples/082/dictionaries/firefox/60-dns_over_https.yml b/examples/082/structural_files/firefox/60-dns_over_https.yml similarity index 100% rename from examples/082/dictionaries/firefox/60-dns_over_https.yml rename to examples/082/structural_files/firefox/60-dns_over_https.yml diff --git a/examples/083/dictionaries/firefox/60-dns_over_https.yml b/examples/083/structural_files/firefox/60-dns_over_https.yml similarity index 100% rename from examples/083/dictionaries/firefox/60-dns_over_https.yml rename to examples/083/structural_files/firefox/60-dns_over_https.yml diff --git a/examples/090/dictionaries/firefox/00-proxy.yml b/examples/090/structural_files/firefox/00-proxy.yml similarity index 100% rename from examples/090/dictionaries/firefox/00-proxy.yml rename to examples/090/structural_files/firefox/00-proxy.yml diff --git a/examples/090/dictionaries/firefox/10-manual.yml b/examples/090/structural_files/firefox/10-manual.yml similarity index 100% rename from examples/090/dictionaries/firefox/10-manual.yml rename to examples/090/structural_files/firefox/10-manual.yml diff --git a/examples/090/dictionaries/firefox/20-manual.yml b/examples/090/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/090/dictionaries/firefox/20-manual.yml rename to examples/090/structural_files/firefox/20-manual.yml diff --git a/examples/090/dictionaries/firefox/30-auto.yml b/examples/090/structural_files/firefox/30-auto.yml similarity index 100% rename from examples/090/dictionaries/firefox/30-auto.yml rename to examples/090/structural_files/firefox/30-auto.yml diff --git a/examples/090/dictionaries/firefox/40-no_proxy.yml b/examples/090/structural_files/firefox/40-no_proxy.yml similarity index 100% rename from examples/090/dictionaries/firefox/40-no_proxy.yml rename to examples/090/structural_files/firefox/40-no_proxy.yml diff --git a/examples/090/dictionaries/firefox/50-prompt_authentication.yml b/examples/090/structural_files/firefox/50-prompt_authentication.yml similarity index 100% rename from examples/090/dictionaries/firefox/50-prompt_authentication.yml rename to examples/090/structural_files/firefox/50-prompt_authentication.yml diff --git a/examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/090/structural_files/firefox/55-proxy_dns_socks5.yml similarity index 100% rename from examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml rename to examples/090/structural_files/firefox/55-proxy_dns_socks5.yml diff --git a/examples/090/dictionaries/firefox/60-dns_over_https.yml b/examples/090/structural_files/firefox/60-dns_over_https.yml similarity index 100% rename from examples/090/dictionaries/firefox/60-dns_over_https.yml rename to examples/090/structural_files/firefox/60-dns_over_https.yml diff --git a/examples/091/dictionaries/firefox/20-manual.yml b/examples/091/structural_files/firefox/20-manual.yml similarity index 100% rename from examples/091/dictionaries/firefox/20-manual.yml rename to examples/091/structural_files/firefox/20-manual.yml diff --git a/examples/092/dictionaries/firefox/empty b/examples/092/structural_files/firefox/empty similarity index 100% rename from examples/092/dictionaries/firefox/empty rename to examples/092/structural_files/firefox/empty diff --git a/examples/092/dictionaries/firefox/empty.yml b/examples/092/structural_files/firefox/empty.yml similarity index 100% rename from examples/092/dictionaries/firefox/empty.yml rename to examples/092/structural_files/firefox/empty.yml diff --git a/examples/100/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/100/structural_files/foxyproxy/00-foxyproxy.yml similarity index 100% rename from examples/100/dictionaries/foxyproxy/00-foxyproxy.yml rename to examples/100/structural_files/foxyproxy/00-foxyproxy.yml diff --git a/examples/101/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/101/structural_files/foxyproxy/00-foxyproxy.yml similarity index 100% rename from examples/101/dictionaries/foxyproxy/00-foxyproxy.yml rename to examples/101/structural_files/foxyproxy/00-foxyproxy.yml diff --git a/examples/102/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/102/structural_files/foxyproxy/00-foxyproxy.yml similarity index 100% rename from examples/102/dictionaries/foxyproxy/00-foxyproxy.yml rename to examples/102/structural_files/foxyproxy/00-foxyproxy.yml diff --git a/examples/103/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/103/structural_files/foxyproxy/00-foxyproxy.yml similarity index 100% rename from examples/103/dictionaries/foxyproxy/00-foxyproxy.yml rename to examples/103/structural_files/foxyproxy/00-foxyproxy.yml diff --git a/examples/104/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/104/structural_files/foxyproxy/00-foxyproxy.yml similarity index 100% rename from examples/104/dictionaries/foxyproxy/00-foxyproxy.yml rename to examples/104/structural_files/foxyproxy/00-foxyproxy.yml diff --git a/examples/110/dictionaries/foxyproxy/10-redefine.yml b/examples/110/structural_files/foxyproxy/10-redefine.yml similarity index 100% rename from examples/110/dictionaries/foxyproxy/10-redefine.yml rename to examples/110/structural_files/foxyproxy/10-redefine.yml