Update Linearize tool to support Windows paths; fix variable scope; update README and example configuration #6372

pull veqtrus wants to merge 1 commits into bitcoin:master from veqtrus:linearize_win changing 2 files +10 −8

veqtrus commented at 11:51 AM on July 3, 2015: contributor

Windows uses backslashes () in paths. An option has been added to allow setting which type of slash to be used. By default the forward slash (/) is used. Also updated the example configuration with the respective option.

I added 'self.' in front of a few variables since without it the script didn't work for me.

Minor fixes for README.
jgarzik commented at 11:56 AM on July 3, 2015: contributor

seems reasonable
laanwj commented at 12:26 PM on July 3, 2015: member

Python has excellent path manipulation utilities. Instead of making the path character configurable, why not use Python's path.join?
laanwj added the label Dev Scripts on Jul 3, 2015
jonasschnelli commented at 2:30 PM on July 3, 2015: contributor

slightly tested ACK (not on windows). Would recommend to squash to purge out the reverts and the non-path.join way.

in contrib/linearize/linearize-data.py:None in 5c29b7bf6c outdated

 209 | @@ -209,14 +210,14 @@ def run(self):
 210 |  				return
 211 |  			inLenLE = inhdr[4:]
 212 |  			su = struct.unpack("<I", inLenLE)
 213 | -			inLen = su[0] - 80 # length without header
 214 | +			self.inLen = su[0] - 80 # length without header

laanwj commented at 2:41 PM on July 3, 2015:

I'm not sure making inLen an instance variable is the right solution to the problem. Only one function outside run(), writeBlock(), uses self.inLen, which is never defined, but the on-disk size can be easily computed in the function itself with:

def writeBlock(self, inhdr, blk_hdr, rawblock):
    blockSizeOnDisk = len(inhdr) + len(blk_hdr) + len(rawblock)
    if not self.fileOutput and ((self.outsz + blockSizeOnDisk) > self.maxOutSz):

laanwj commented at 12:49 PM on July 10, 2015: member

ACK after squashing commits into one
veqtrus closed this on Jul 10, 2015
Update Linearize tool to support Windows paths e3c42973b2
veqtrus reopened this on Jul 10, 2015
laanwj merged this on Jul 17, 2015
laanwj closed this on Jul 17, 2015
laanwj referenced this in commit dcc495e011 on Jul 17, 2015
veqtrus deleted the branch on Jul 26, 2015
zkbot referenced this in commit df07f9ad23 on Feb 15, 2017
zkbot referenced this in commit ec069ce96c on Mar 3, 2017
zkbot referenced this in commit 702eefc71a on Mar 3, 2017
zkbot referenced this in commit 99c4c6de0c on Mar 3, 2017
DrahtBot locked this on Aug 16, 2022

Contributors

Labels