remove trailing "\r\n" or "\n"

go-gitea · Mar 30, 2023 · 2c72257 · 2c72257
1 parent 3799a92
commit 2c72257
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/web_src/js/components/RepoActionView.test.js b/web_src/js/components/RepoActionView.test.js
@@ -4,6 +4,8 @@ import {processConsoleLine} from './RepoActionView.vue';
 
 test('processConsoleLine', () => {
   expect(processConsoleLine('abc')).toEqual('abc');
+  expect(processConsoleLine('abc\n')).toEqual('abc');
+  expect(processConsoleLine('abc\r\n')).toEqual('abc');
   expect(processConsoleLine('\r')).toEqual('');
   expect(processConsoleLine('\rx\rabc')).toEqual('abc');
   expect(processConsoleLine('\rabc\rx\r')).toEqual('xbc');

diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
@@ -308,6 +308,11 @@ export function initRepositoryActionView() {
 }
 
 export function processConsoleLine(line) {
+  if (line.endsWith('\r\n')) {
+    line = line.substring(0, line.length - 2);
+  } else if (line.endsWith('\n')) {
+    line = line.substring(0, line.length - 1);
+  }
   if (!line.includes('\r')) return line;
 
   // handle "\rReading...1%\rReading...5%\rReading...100%", only show the final message