cleanup

Author: quackduck

aces.go

@@ -298,37 +298,17 @@ func (c *anyCoding) Encode(dst io.Writer, src io.Reader) error {
 		n, err := io.ReadFull(src, buf)
 		if err != nil && err != io.ErrUnexpectedEOF {
 			if err == io.EOF {
-				//println("got eof")
-				r := toBase(
-					bytesToInt([]byte{byte(c.chunkSize)}),
-					make([]rune, 0, 8),
-					c.charset,
-				)
-
-				//encoded nunmber must be less  than chunksize long
-				//println(string(r), n, fmt.Sprint([]byte{byte(n)}), bytesToInt([]byte{byte(n)}).String(), string(c.charset))
-				//result = append(result, encodeByteChunk(c.charset, buf, c.rPerChunk)...)
+				r := toBase(bytesToInt([]byte{byte(c.chunkSize)}), make([]rune, 0, 8), c.charset)
 				result = append(result, r...)
 				_, err = dst.Write([]byte(string(result)))
 			}
 			return err
 		}
-		if err == io.ErrUnexpectedEOF { // end of data, not a multiple of chunk size. TODO: somehow encode how many null bytes to cut off when decoding
-			// buffer is going to have zeros at the end
-			//buf = append(buf[:n], make([]byte, c.chunkSize-n)...)
-			//buf = append(buf, byte(c.chunkSize-n)) // number of zeros to cut off
-			//var b =  // just one byte encoded
-			// r is that one byte encoded
-			//println("got unexpected eof")
-			r := toBase(
-				bytesToInt([]byte{byte(n)}),
-				make([]rune, 0, 8),
-				c.charset,
-			)
-
-			//encoded nunmber must be less  than chunksize long
-			//println(string(r), n, fmt.Sprint([]byte{byte(n)}), bytesToInt([]byte{byte(n)}).String(), string(c.charset))
+		if err == io.ErrUnexpectedEOF { // end of data, not a multiple of chunk size.
+			// encode how many bytes of this chunk to keep
 			result = append(result, encodeByteChunk(c.charset, buf, c.rPerChunk)...)
+			r := toBase(bytesToInt([]byte{byte(n)}), make([]rune, 0, 8), c.charset)
+			//encoded number must be less  than chunksize long
 			result = append(result, r...)
 			_, err = dst.Write([]byte(string(result)))
 			if err != nil {
@@ -338,7 +318,6 @@ func (c *anyCoding) Encode(dst io.Writer, src io.Reader) error {
 		}
 
 		result = append(result, encodeByteChunk(c.charset, buf, c.rPerChunk)...)
-		//println(fmt.Sprint(result))
 
 		if len(result)+(8*int(c.chunkSize)) > cap(result) { // (8*c.chunkSize) is the max size of the result (considering worst case: charset has length 2)
 			_, err = dst.Write([]byte(string(result)))
@@ -385,40 +364,22 @@ func (c *anyCoding) Decode(dst io.Writer, src io.Reader) error {
 	var currChunk []byte
 	var lastChunk []byte
 	for {
-		//println("result size", len(result))
 		for i := range buf { // read a chunk
 			buf[i], _, err = br.ReadRune()
 			if err != nil {
 				if err == io.EOF {
-					//println("decoding. buf is", string(buf[:i-1]), fmt.Sprint(buf[:i-1]), "currchunk size is", len(currChunk))
 					toKeep := int64(c.chunkSize)
 					if i > 0 { // we_did read some data, right?
-
 						// the current value of buf decoded will be the length of the previous chunk to keep.
-
 						bigNum, err := fromBase(buf[:i-1], c.charset)
 						if err != nil {
 							return err
 						}
 						toKeep = bigNum.Int64()
-						//println(toKeep)
-
-						//	// now check the last byte (which encodes how many zeros to cut off)
-						//	err = br.UnreadByte()
-						//	if err != nil {
-						//		return err
-						//	}
-						//	b, err := br.ReadByte()
-						//	if err != nil {
-						//		return err
-						//	}
-						//	result = result[:len(buf)-int(b)]
 					}
-					//println(toKeep, c.chunkSize)
 					currChunk = currChunk[:toKeep]
 					result = append(result, currChunk...)
 					_, err = dst.Write(result)
-					//println("YAHOOO!!")
 				}
 				return err
 			}
@@ -432,9 +393,7 @@ func (c *anyCoding) Decode(dst io.Writer, src io.Reader) error {
 			return err
 		}
 		result = append(result, lastChunk...)
-		//println(len(result))
-		lastChunk = currChunk
-		//copy(lastChunk, currChunk) // this system is here because the current chunk may get modified in the next round when there's an EOF
+		lastChunk = currChunk // this system is here because the current chunk may get modified in the next round when there's an EOF
 
 		if len(result)+c.chunkSize > cap(result) {
 			_, err = dst.Write(result)