Commit db8820d1a641a361e795ea23f26415f1c5eec62d

Parents: fdf299fa88b8aa871d0afc435a2055bee6ba5c17

From: Moritz Poldrack <ich@moritz-poldrack.de>
Date: Wed May 19 23:29:43 2021 +0700

started work on encoder

		

Stats

encdec.go +28/-0
encoder.go +76/-0
splitting.go +28/-0
type.go +0/-12
type_test.go +0/-12

Changeset

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
diff --git a/encdec.go b/encdec.go
new file mode 100644
index 0000000000000000000000000000000000000000..a2e7b7ee848210313b2d8d1cb14f39e2c2efe333
--- /dev/null
+++ b/encdec.go
@@ -0,0 +1,28 @@
+package yenc
+
+import "unsafe"
+
+func yenc(input *[8]byte) []byte {
+	var mask [8]bool
+
+	// add 42 (0x2a) to every byte
+	*(*uint64)(unsafe.Pointer(&input)) += 0x2a2a2a2a2a2a2a2a
+
+	for i := 0; i < 8; i++ {
+		bte := (*(*[8]byte)(unsafe.Pointer(&input)))[i]
+
+		if bte == 0x00 || bte == 0x0A || bte == 0x0D || bte == 0x3D {
+			(*(*[8]byte)(unsafe.Pointer(&input)))[i] += uint8(64)
+			mask[i] = true
+		}
+	}
+
+	var result []byte
+	for i := 0; i < 8; i++ {
+		if mask[i] {
+			result = append(result, '=')
+		}
+		result = append(result, input[i])
+	}
+	return result
+}
diff --git a/encoder.go b/encoder.go
new file mode 100644
index 0000000000000000000000000000000000000000..4301acb091aff1f43e2789157cf925257412c5c1
--- /dev/null
+++ b/encoder.go
@@ -0,0 +1,76 @@
+package yenc
+
+import (
+	"bytes"
+	"fmt"
+	"hash"
+	"hash/crc32"
+	"io"
+	"sync"
+)
+
+type Encoder struct {
+	file     io.Writer
+	buffer   bytes.Buffer
+	writeMtx sync.Mutex
+
+	LineLength int
+	BlockSize  int
+	CRC        hash.Hash32
+}
+
+func NewEncoder(w io.Writer) *Encoder {
+	enc := &Encoder{
+		file:       w,
+		LineLength: 128,
+		BlockSize:  0,
+		CRC:        crc32.NewIEEE(),
+	}
+	return enc
+}
+
+func (e *Encoder) Write(slice []byte) (int, error) {
+	e.writeMtx.Lock()
+	defer e.writeMtx.Unlock()
+
+	var bytesWritten int
+	remainder := len(slice) % 8
+	parts := getParts(&slice)
+
+	maxindex := len(*parts) - 1
+
+	var err error
+	var n int
+	var encoded []byte
+
+	for i, p := range *parts {
+		encoded = yenc(&p)
+
+		if i == maxindex {
+			break
+		}
+
+		n, err = e.buffer.Write(encoded)
+		if err != nil {
+			return bytesWritten, fmt.Errorf("failed writing yenc to output-buffer: %v")
+		}
+		bytesWritten += n
+	}
+
+	n, err = e.buffer.Write(encoded[:len(encoded)-(8-remainder)])
+	if err != nil {
+		return bytesWritten, fmt.Errorf("failed writing yenc to output-buffer: %v")
+	}
+	bytesWritten += n
+
+	err = e.writeBlock(false)
+	if err != nil {
+		return n, err
+	}
+
+	return bytesWritten, nil
+}
+
+func (e *Encoder) writeBlock(closing bool) error {
+	return nil
+}
diff --git a/splitting.go b/splitting.go
new file mode 100644
index 0000000000000000000000000000000000000000..89c8c217c8acfd0b284f5c574053153d8fdff3a6
--- /dev/null
+++ b/splitting.go
@@ -0,0 +1,28 @@
+package yenc
+
+func getParts(in *[]byte) *[][8]byte {
+	var parts [][8]byte
+
+	var part [8]byte
+	var i int
+
+	for _, b := range *in {
+		part[i] = b
+		i++
+
+		if i == 8 {
+			parts = append(parts, part)
+			i = 0
+		}
+	}
+
+	if i != 0 {
+		for i < 8 {
+			part[i] = 0
+			i++
+		}
+		parts = append(parts, part)
+	}
+
+	return &parts
+}
diff --git a/type.go b/type.go
deleted file mode 100644
index a8c7f7567bd4200f2a7913788672cf7383b46e04..0000000000000000000000000000000000000000
--- a/type.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package yenc
-
-type Encoder struct {
-	LineLength int
-	BlockSize  int
-}
-
-func NewEncoder() Encoder {
-	return Encoder{
-		LineLength: 128,
-	}
-}
diff --git a/type_test.go b/type_test.go
deleted file mode 100644
index 273aa10802dde03508359013b8d47128d635952e..0000000000000000000000000000000000000000
--- a/type_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package yenc
-
-import "testing"
-
-func TestNewEncoder(t *testing.T) {
-	// Did I say GetLimit was useless? This one is even less useful… but I
-	// absolutely hate red lines in the Coverage Report
-	y := NewEncoder()
-	if y.LineLength != 128 {
-		t.Fail()
-	}
-}