├── .gitignore ├── LICENSE ├── README.md ├── diff_tool.py ├── file.md ├── file_update.md ├── friends_shopping_list.txt ├── my_shopping_list.txt └── shopping_list_diff.py /.gitignore: -------------------------------------------------------------------------------- 1 | # IDEs 2 | .vscode/ 3 | .idea/ 4 | 5 | # __pycache__ 6 | __pycache__/ 7 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | 2 | MIT License 3 | 4 | Copyright (c) 2020 Florian Dahlitz 5 | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 7 | 8 | The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 9 | 10 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 11 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | ## Description 2 | 3 | This repository contains the code used in the *Create Your Own Diff-Tool Using Python* article published on my personal blog. 4 | [Here's](https://florian-dahlitz.de/blog/create-your-own-diff-tool-using-python) the link to the article. 5 | -------------------------------------------------------------------------------- /diff_tool.py: -------------------------------------------------------------------------------- 1 | # diff_tool.py 2 | 3 | import argparse 4 | import difflib 5 | import sys 6 | 7 | from pathlib import Path 8 | 9 | 10 | def create_diff(old_file: Path, new_file: Path, output_file: Path = None): 11 | file_1 = open(old_file).readlines() 12 | file_2 = open(new_file).readlines() 13 | 14 | if output_file: 15 | delta = difflib.HtmlDiff().make_file( 16 | file_1, file_2, old_file.name, new_file.name 17 | ) 18 | with open(output_file, "w") as f: 19 | f.write(delta) 20 | else: 21 | delta = difflib.unified_diff(file_1, file_2, old_file.name, new_file.name) 22 | sys.stdout.writelines(delta) 23 | 24 | 25 | def main(): 26 | parser = argparse.ArgumentParser() 27 | parser.add_argument("old_file_version") 28 | parser.add_argument("new_file_version") 29 | parser.add_argument("--html", help="specify html to write to") 30 | args = parser.parse_args() 31 | 32 | old_file = Path(args.old_file_version) 33 | new_file = Path(args.new_file_version) 34 | 35 | if args.html: 36 | output_file = Path(args.html) 37 | else: 38 | output_file = None 39 | 40 | create_diff(old_file, new_file, output_file) 41 | 42 | 43 | if __name__ == "__main__": 44 | main() 45 | -------------------------------------------------------------------------------- /file.md: -------------------------------------------------------------------------------- 1 | Lorem ipsum dolor sit amet, consectetur adipiscing elit. 2 | Sed id ex nec ipsum ornare tristique. 3 | Etiam facilisis interdum ligula, eu venenatis lorem ullamcorper non. 4 | Vivamus auctor sapien ut justo faucibus, venenatis venenatis est dignissim. 5 | Mauris felis dolor, sollicitudin eget ullamcorper quis, semper a neque. 6 | Phasellus accumsan vitae metus ut placerat. 7 | Integer neque ex, pretium eu consequat sit amet, vulputate et purus. 8 | Aliquam ac nunc volutpat leo venenatis interdum. 9 | Nam feugiat risus nec velit pretium sodales. 10 | Morbi efficitur eros id ante pellentesque, vitae scelerisque metus varius. 11 | Maecenas suscipit, urna a malesuada rhoncus, sapien nulla aliquet justo, in aliquet justo libero eget sapien. 12 | Nulla sit amet suscipit lacus, a semper tellus. 13 | Quisque lobortis, massa vitae rutrum sollicitudin, enim magna laoreet dolor, at elementum sapien risus nec tellus. 14 | Cras at nibh in lacus auctor tempor in id diam. 15 | Phasellus semper sapien nec tortor tincidunt, id aliquet est efficitur. 16 | 17 | Nulla non tincidunt turpis. 18 | Sed faucibus nisl vitae metus molestie efficitur. 19 | Vestibulum in dapibus enim, vitae vulputate arcu. 20 | Suspendisse leo lacus, feugiat eget nisl at, rhoncus pulvinar arcu. 21 | Quisque et nisi metus. 22 | Aliquam vestibulum aliquet augue, id ornare ex pulvinar quis. 23 | Aenean dapibus mauris vestibulum gravida aliquam. 24 | Nunc nec maximus nunc. 25 | Donec gravida ligula non justo tristique tincidunt. 26 | Nulla at convallis felis. 27 | Vivamus aliquam tortor lectus, id auctor urna egestas quis. 28 | Aliquam sed arcu libero. 29 | Aenean accumsan laoreet velit, eu ultricies ipsum bibendum ac. 30 | -------------------------------------------------------------------------------- /file_update.md: -------------------------------------------------------------------------------- 1 | Lorem ipsum dolor sit amet, consectetur adipiscing elit. 2 | Sed id ex nec ipsum ornare tristique. 3 | Etiam facilisis interdum ligula, eu venenatis lorem ullamcorper non. 4 | Vivamus auctor sapien ut justo faucibus, venenatis venenatis est dignissim. 5 | Mauris felis dolor, sollicitudin eget ullamcorper quis, semper a neque. 6 | Phasellus accumsan vitae metus ut placerat. 7 | Integer neque ex, pretium eu consequat sit amet, vulputate et purus. 8 | Aliquam ac nunc volutpat leo venenatis interdum. 9 | Nam feugiat risus nec velit pretium sodales. 10 | Morbi efficitur eros id ante pellentesque, vitae scelerisque metus varius. 11 | Maecenas suscipit, urna a malesuada rhoncus, sapien nulla aliquet justo, in aliquet justo libero eget sapien. 12 | Nulla sit amet [...] a semper tellus. 13 | Quisque lobortis, massa vitae rutrum sollicitudin, enim magna laoreet dolor, at elementum sapien risus nec tellus. 14 | Cras at nibh in lacus auctor tempor in id diam. 15 | Phasellus semper sapien nec tortor tincidunt, id aliquet est efficitur. 16 | 17 | Nulla non tincidunt turpis. 18 | Sed faucibus nisl vitae metus molestie efficitur. 19 | Vestibulum in dapibus enim, vitae vulputate arcu. 20 | Suspendisse leo lacus, feugiat eget nisl at, rhoncus pulvinar arcu. 21 | Quisque et nisi metus. 22 | Added a new sentence here. 23 | Aliquam vestibulum aliquet augue, id ornare ex pulvinar quis. 24 | Aenean dapibus mauris vestibulum gravida aliquam. 25 | Nunc nec maximus nunc. 26 | Donec gravida ligula non justo tristique tincidunt. 27 | Nulla at convallis felis. 28 | Vivamus aliquam tortor lectus id auctor urna egestas quis. 29 | Aliquam sed arcu libero. 30 | Aenean accumsan laoreet velit, eu ultricies ipsum bibendum ac. 31 | -------------------------------------------------------------------------------- /friends_shopping_list.txt: -------------------------------------------------------------------------------- 1 | cheese 2 | tomatoes 3 | salami 4 | -------------------------------------------------------------------------------- /my_shopping_list.txt: -------------------------------------------------------------------------------- 1 | cheese 2 | tomates 3 | -------------------------------------------------------------------------------- /shopping_list_diff.py: -------------------------------------------------------------------------------- 1 | # shopping_list_diff.py 2 | 3 | import difflib 4 | import sys 5 | 6 | file1 = open("my_shopping_list.txt").readlines() 7 | file2 = open("friends_shopping_list.txt").readlines() 8 | 9 | delta = difflib.unified_diff(file1, file2, "my_shopping_list.txt", "friends_shopping_list.txt") 10 | sys.stdout.writelines(delta) 11 | --------------------------------------------------------------------------------