Skip to content

Commit 38a641c

Browse files
halyna-devhalyna-dev
committed
add branch names to the header
1 parent 3a99da9 commit 38a641c

File tree

3 files changed

+79
-68
lines changed

3 files changed

+79
-68
lines changed

‎niceDiff.bat‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ SET branchA=%1
99
SET branchB=%2
1010
SET comparePath=%3
1111

12-
::validate 1st parametr
12+
:: validate 1st parametr
1313
IF "%branchA%"=="" (
1414
echo %me%: incorrect parameters. Please use: niceDiff ^<branch1-name^> ^<branch2-name^> [optional ^<path-to-comparing-files^>]
1515
GOTO:EOF
1616
)
1717

18-
::validate 2nd parametr
18+
:: validate 2nd parametr
1919
IF "%branchB%"=="" (
2020
echo %me%: incorrect parameters. Please use: niceDiff ^<branch1-name^> ^<branch2-name^> [optional ^<path-to-comparing-files^>]
2121
GOTO:EOF
@@ -27,5 +27,12 @@ git diff --minimal %branchA% %branchB% %3 > %parent%/diff.txt
2727
:: note: --minimal flag get line different, --word-diff is nuclear diff
2828

2929
:: parce file into html
30-
call parceDiff.bat
30+
31+
:: add top part of template
32+
TYPE %parent%template_top_report.html> niceDiff-report.html
33+
:: add branches to the header
34+
SET svgBranch="data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHZpZXdCb3g9IjAgMCAxNzIgMTcyIj48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9Im5vbnplcm8iIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBzdHJva2UtbGluZWNhcD0iYnV0dCIgc3Ryb2tlLWxpbmVqb2luPSJtaXRlciIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtZGFzaGFycmF5PSIiIHN0cm9rZS1kYXNob2Zmc2V0PSIwIiBmb250LWZhbWlseT0ibm9uZSIgZm9udC13ZWlnaHQ9Im5vbmUiIGZvbnQtc2l6ZT0ibm9uZSIgdGV4dC1hbmNob3I9Im5vbmUiIHN0eWxlPSJtaXgtYmxlbmQtbW9kZTogbm9ybWFsIj48cGF0aCBkPSJNMCwxNzJ2LTE3MmgxNzJ2MTcyeiIgZmlsbD0ibm9uZSI+PC9wYXRoPjxnIGZpbGw9IiM1MGUwZDkiPjxwYXRoIGQ9Ik00NC43OTE2NywxNy45MTY2N2MtMTIuODQyNjcsMCAtMjMuMjkxNjcsMTAuNDQ5IC0yMy4yOTE2NywyMy4yOTE2N2MwLDEwLjk5MDg2IDcuNjU5ODksMjAuMjA1MyAxNy45MTY2NywyMi42NDA3OXY1Mi42MDkyMWMwLDEwLjgyMDg2IDguODg3NDgsMTkuNzA4MzMgMTkuNzA4MzMsMTkuNzA4MzNoMTUuNjkxMDhsLTUuMTU4MDQsNS4xNTgwNGMtMS40MDQxMiwxLjM0ODE1IC0xLjk2OTcxLDMuMzUwMDUgLTEuNDc4NjYsNS4yMzM2NGMwLjQ5MTA1LDEuODgzNTkgMS45NjIwMiwzLjM1NDU2IDMuODQ1NjEsMy44NDU2MWMxLjg4MzU5LDAuNDkxMDUgMy44ODU0OSwtMC4wNzQ1NSA1LjIzMzY0LC0xLjQ3ODY2bDE0LjMzMzMzLC0xNC4zMzMzM2MyLjA5ODIzLC0yLjA5OTEgMi4wOTgyMywtNS41MDE0OSAwLC03LjYwMDU5bC0xNC4zMzMzMywtMTQuMzMzMzNjLTEuMDEyMjIsLTEuMDQyNCAtMi40MDMzLC0xLjYzMDY0IC0zLjg1NjI4LC0xLjYzMDdjLTIuMTg4MTQsMC4wMDA1MyAtNC4xNTc2LDEuMzI3MzUgLTQuOTgwMDYsMy4zNTUwNGMtMC44MjI0NSwyLjAyNzcgLTAuMzMzNzUsNC4zNTE1NiAxLjIzNTc1LDUuODc2MjRsNS4xNTgwNCw1LjE1ODA0aC0xNS42OTEwOGMtNS4wMTAzMSwwIC04Ljk1ODMzLC0zLjk0ODAyIC04Ljk1ODMzLC04Ljk1ODMzdi01Mi42MDkyMWMxMC4yNTY3NywtMi40MzU0OSAxNy45MTY2NywtMTEuNjQ5OTMgMTcuOTE2NjcsLTIyLjY0MDc5YzAsLTEyLjg0MjY3IC0xMC40NDksLTIzLjI5MTY3IC0yMy4yOTE2NywtMjMuMjkxNjd6TTk4LjQzNjY5LDIxLjQ1MTAxYy0xLjM5NTkyLDAuMDQwNjggLTIuNzIxMjEsMC42MjMwMSAtMy42OTUzMSwxLjYyMzdsLTE0LjMzMzMzLDE0LjMzMzMzYy0yLjA5ODIzLDIuMDk5MSAtMi4wOTgyMyw1LjUwMTQ5IDAsNy42MDA1OWwxNC4zMzMzMywxNC4zMzMzM2MxLjM0ODE1LDEuNDA0MTIgMy4zNTAwNSwxLjk2OTcxIDUuMjMzNjQsMS40Nzg2NmMxLjg4MzU5LC0wLjQ5MTA1IDMuMzU0NTYsLTEuOTYyMDIgMy44NDU2MSwtMy44NDU2MWMwLjQ5MTA1LC0xLjg4MzU5IC0wLjA3NDU1LC0zLjg4NTQ5IC0xLjQ3ODY2LC01LjIzMzY0bC01LjE1ODA0LC01LjE1ODA0aDE1LjY5MTA4YzUuMDEwMzEsMCA4Ljk1ODMzLDMuOTQ4MDIgOC45NTgzMyw4Ljk1ODMzdjUyLjYwOTIxYy0xMC4yNTY3NywyLjQzNTQ5IC0xNy45MTY2NywxMS42NDk5MyAtMTcuOTE2NjcsMjIuNjQwNzljMCwxMi44NDI2NyAxMC40NDksMjMuMjkxNjcgMjMuMjkxNjcsMjMuMjkxNjdjMTIuODQyNjcsMCAyMy4yOTE2NywtMTAuNDQ5IDIzLjI5MTY3LC0yMy4yOTE2N2MwLC0xMC45OTA4NiAtNy42NTk4OSwtMjAuMjA1MyAtMTcuOTE2NjcsLTIyLjY0MDc5di01Mi42MDkyMWMwLC0xMC44MjA4NiAtOC44ODc0OCwtMTkuNzA4MzMgLTE5LjcwODMzLC0xOS43MDgzM2gtMTUuNjkxMDhsNS4xNTgwNCwtNS4xNTgwNGMxLjU4NzA2LC0xLjU0NTY2IDIuMDYzMzYsLTMuOTA2NjYgMS4xOTk2NiwtNS45NDY3MmMtMC44NjM3LC0yLjA0MDA3IC0yLjg5MDQ4LC0zLjM0MTM0IC01LjEwNDkzLC0zLjI3NzU2eiI+PC9wYXRoPjwvZz48L2c+PC9zdmc+"
35+
ECHO ^<p id="branches"^> ^<img src=%svgBranch% width="18" height="18"^> %branchA% ^< %branchB% ^</p^>>> niceDiff-report.html
36+
37+
call parseDiff.bat
3138

parceDiff.bat renamed to parseDiff.bat

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
ECHO start parcing...
2-
3-
::add top part of template
4-
TYPE %parent%template_top_report.html> niceDiff-report.html
5-
6-
SET parent=%~dp0
7-
8-
::CONSTANTS
9-
SET sOpenFile=^</div^>^<button class="section"^>
10-
SET sCloseFile=^</button^>^<div class="section-content"^>^<div^>
11-
SET sOpenCodeBlock=^</div^>^<div^>
12-
SET sOpenCodeLine=^<pre^>
13-
SET sCloseCodeLine=^</pre^>
14-
SET sOpenAddCodeLine=^<pre class="add"^>
15-
SET sOpenRemoveCodeLine=^<pre class="remove"^>
16-
17-
::init code block
18-
ECHO ^<div^>>> niceDiff-report.html
19-
::init file section
20-
ECHO ^<div^>>> niceDiff-report.html
21-
22-
SETLOCAL enabledelayedexpansion
23-
FOR /F "usebackq tokens=*" %%A IN ("%parent%/diff.txt") DO (
24-
SET line1=%%A
25-
SET line2=!line1:^<=^&lt;!
26-
SET line=!line2:^>=^&gt;!
27-
IF "!line:~0,10!"=="diff --git" (
28-
rem close last code block in previous file
29-
ECHO ^</div^>>> niceDiff-report.html
30-
rem new file
31-
ECHO !sOpenFile! >> niceDiff-report.html
32-
) ELSE IF "!line:~0,5!"=="--- a" (
33-
rem get file name
34-
ECHO !line:~5!!sCloseFile! >> niceDiff-report.html
35-
) ELSE IF "!line:~0,5!"=="+++ b" (
36-
rem skip line
37-
) ELSE IF "!line:~0,6!"=="index " (
38-
rem skip line
39-
) ELSE IF "!line:~0,3!"=="@@ " (
40-
rem start diff block
41-
ECHO !sOpenCodeBlock!!sOpenCodeLine!!line!!sCloseCodeLine! >> niceDiff-report.html
42-
) ELSE IF "!line:~0,1!"=="-" (
43-
rem start remove line
44-
ECHO !sOpenRemoveCodeLine!!line:~1!!sCloseCodeLine! >> niceDiff-report.html
45-
) ELSE IF "!line:~0,1!"=="+" (
46-
rem start add line
47-
ECHO !sOpenAddCodeLine!!line:~1!!sCloseCodeLine! >> niceDiff-report.html
48-
) ELSE (
49-
rem default add line
50-
ECHO !sOpenCodeLine!!line!!sCloseCodeLine! >> niceDiff-report.html
51-
)
52-
)
53-
::close last code block
54-
ECHO ^</div^>>> niceDiff-report.html
55-
::close file section
56-
ECHO ^</div^>>> niceDiff-report.html
57-
58-
::add bottom part of template
59-
TYPE %parent%template_bottom_report.html>> niceDiff-report.html
60-
61-
ECHO complited
62-
1+
ECHO start parcing...
2+
3+
SET parent=%~dp0
4+
5+
:: CONSTANTS
6+
SET sOpenFile=^</div^>^<button class="section"^>
7+
SET sCloseFile=^</button^>^<div class="section-content"^>^<div^>
8+
SET sOpenCodeBlock=^</div^>^<div^>
9+
SET sOpenCodeLine=^<pre^>
10+
SET sCloseCodeLine=^</pre^>
11+
SET sOpenAddCodeLine=^<pre class="add"^>
12+
SET sOpenRemoveCodeLine=^<pre class="remove"^>
13+
14+
:: open tag for main cotent
15+
ECHO ^<main^>>>niceDiff-report.html
16+
17+
:: init code block
18+
ECHO ^<div^>>> niceDiff-report.html
19+
:: init file section
20+
ECHO ^<div^>>> niceDiff-report.html
21+
22+
SETLOCAL enabledelayedexpansion
23+
FOR /F "usebackq tokens=*" %%A IN ("%parent%/diff.txt") DO (
24+
SET line1=%%A
25+
SET line2=!line1:^<=^&lt;!
26+
SET line=!line2:^>=^&gt;!
27+
IF "!line:~0,10!"=="diff --git" (
28+
rem close last code block in previous file
29+
ECHO ^</div^>>> niceDiff-report.html
30+
rem new file
31+
ECHO !sOpenFile! >> niceDiff-report.html
32+
) ELSE IF "!line:~0,5!"=="--- a" (
33+
rem get file name
34+
ECHO !line:~5!!sCloseFile! >> niceDiff-report.html
35+
) ELSE IF "!line:~0,5!"=="+++ b" (
36+
rem skip line
37+
) ELSE IF "!line:~0,6!"=="index " (
38+
rem skip line
39+
) ELSE IF "!line:~0,3!"=="@@ " (
40+
rem start diff block
41+
ECHO !sOpenCodeBlock!!sOpenCodeLine!!line!!sCloseCodeLine! >> niceDiff-report.html
42+
) ELSE IF "!line:~0,1!"=="-" (
43+
rem start remove line
44+
ECHO !sOpenRemoveCodeLine!!line:~1!!sCloseCodeLine! >> niceDiff-report.html
45+
) ELSE IF "!line:~0,1!"=="+" (
46+
rem start add line
47+
ECHO !sOpenAddCodeLine!!line:~1!!sCloseCodeLine! >> niceDiff-report.html
48+
) ELSE (
49+
rem default add line
50+
ECHO !sOpenCodeLine!!line!!sCloseCodeLine! >> niceDiff-report.html
51+
)
52+
)
53+
:: close last code block
54+
ECHO ^</div^>>> niceDiff-report.html
55+
:: close file section
56+
ECHO ^</div^>>> niceDiff-report.html
57+
58+
:: add bottom part of template
59+
TYPE %parent%template_bottom_report.html>> niceDiff-report.html
60+
61+
ECHO complited
62+

‎template_top_report.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@
5151
color: #50e0d9;
5252
font-size: 26px;
5353
}
54+
#branches {
55+
display: flex;
56+
padding: 10px 50px;
57+
color: #999;
58+
background-color: white;
59+
}
5460
button {
5561
height: 30px;
5662
width: 100%;
@@ -99,7 +105,7 @@
99105

100106
<header>
101107
<h2>Report </h2>
102-
<a target="_blank" class="icon" href="https://github.com/">
108+
<a target="_blank" class="icon" href="https://github.com/halyna-dev/niceDiff">
103109
<i aria-label="icon: github" class="anticon anticon-github">
104110
<svg viewBox="64 64 896 896" class="" data-icon="github" width="1em" height="1em" fill="currentColor"
105111
aria-hidden="true" focusable="false">
@@ -108,5 +114,3 @@ <h2>Report </h2>
108114
</i>
109115
</a>
110116
</header>
111-
112-
<main>

0 commit comments

Comments
 (0)