')
buf.css {'margin':'0 auto'}
ptxt = $('')
- ptxt.addClass 'plaintext'
color = @calccolor(picdata.color)
bgcolor = @calccolor(picdata.bg)
pdiv.addClass 'scrolly'
@@ -62,9 +58,9 @@ class @Sahli
'background-color': bgcolor
'margin': 'auto'
'display': 'inline-block'
- #ptxt.width picdata.width * 8
- #@origwidth = ptxt.width
- #pdiv.width ptxt.width
+ ptxt.width picdata.width * 8
+ @origwidth = ptxt.width
+ pdiv.width ptxt.width
pdiv.prepend buf.clone()
pdiv.append ptxt
pdiv.append buf
@@ -82,72 +78,6 @@ class @Sahli
req.open 'GET', fname, true
req.send null
- @increaseFont = (node, increaseBy=5) ->
- current_size = parseInt($(node).css("font-size"));
- $(node).css("font-size", current_size + increaseBy);
-
- @loadpicture = (picdata, inserthere) ->
- fname = @location + '/' + picdata.file
- pdiv = $('')
- pdiv.addClass 'scrolly'
- pdiv.addClass 'image'
- pdiv.width window.innerWidth
- pdiv.css 'display', 'inline-block'
- pimg = $('
')
- pimg.addClass 'fullwidth'
- pdiv.append pimg
- inserthere.after pdiv
- $('h6').hide()
- $('body').scrollTop 0
- @origwidth = picdata.width
- @origheight = picdata.height
- @bestfit()
-
- @fullwidthplain = =>
- if ($('pre').css("font-size") == "16px")
- $('pre').css("font-size", "2.5vw");
- else
- $('pre').css("font-size", "16px");
-
- @togglefullwidthmode = =>
- if ($('pre').hasClass('plaintext'))
- @fullwidthplain()
- else
- if $('div.scrolly').hasClass('image')
- @bestfit()
- else
- @zoom()
-
- @zoomin = =>
- if ($('pre').hasClass('plaintext'))
- @increaseFont($('pre'), 2)
- else
- @zoom(100);
-
- @zoomout = =>
- if ($('pre').hasClass('plaintext'))
- @increaseFont($('pre'), -2)
- else
- @zoom(-100);
-
- @bestfit = =>
- if $('div.scrolly').hasClass('image')
- if $('div.scrolly').hasClass('bestfitMode')
- $('div.scrolly').removeClass 'bestfitMode'
- $('div.scrolly').addClass 'fullwidthMode'
- $('div.scrolly').width window.innerWidth
- $('div.scrolly').height("")
- $('img.bestfit').addClass 'fullwidth'
- $('img.bestfit').removeClass 'bestfit'
- else
- $('h6').hide()
- $('div.scrolly').addClass 'bestfitMode'
- $('div.scrolly').removeClass 'fullwidthMode'
- $('div.scrolly').width window.innerWidth
- $('div.scrolly').height window.innerHeight
- $('img.fullwidth').addClass 'bestfit'
- $('img.fullwidth').removeClass 'fullwidth'
-
@loadhugeansi = (picdata, inserthere) ->
fname = @location + '/' + picdata.file
pdiv = $('
')
@@ -167,7 +97,7 @@ class @Sahli
@origwidth = canvwidth
@origheight = calcheight
pdiv.width canvwidth
- ), 30, {'bits': '8', "font": picdata.font}
+ ), 30, 'bits': '8'
@loadavatar = (picdata, inserthere) ->
console.log 'avatar', picdata, inserthere
@@ -207,7 +137,6 @@ class @Sahli
filedata = @filedata
filedata[i].pic = $('
' + filedata[i].file + '
')
viewbox.append filedata[i].pic
- $('h6').show()
@loadpic filedata[i], filedata[i].pic
@currentpic += 1
if @currentpic > filedata.length - 1
@@ -217,13 +146,6 @@ class @Sahli
$('body').stop()
@loadinfopanel i
- @prevpic = =>
- i = @currentpic-2
- if i < 0
- i = i + @filedata.length
- @currentpic = i
- @nextpic()
-
@togglefullscreen = ->
docElm = document.documentElement
if @fullscreen
@@ -308,7 +230,7 @@ class @Sahli
zoomee.width newwidth
$('canvas').width newwidth
else
- if parseInt( zoomee.width(), 10 ) != parseInt( @origwidth, 10)
+ if zoomee.width() != @origwidth
zoomee.width @origwidth
$('canvas').width '100%'
else
@@ -393,26 +315,24 @@ class @Sahli
switch ev.which
when @keycode ' '
@nextpic()
- when @keycode 'p'
- @prevpic()
when @keycode 'f'
@togglefullscreen()
when @keycode 's'
@setscroll()
when @keycode 't'
$('body').scrollTop 0
- @togglefullwidthmode()
+ @zoom 0
when @keycode 'b'
$('body').scrollTop $('body').height()
when @keycode 'a'
$('body').stop()
@scroll_direction = - @scroll_direction
when @keycode 'z'
- @togglefullwidthmode()
+ @zoom()
when @keycode 'e'
- @zoomin()
+ @zoom 100
when @keycode 'r'
- @zoomout()
+ @zoom -100
when @keycode 'w'
@changescrolldirection -1
when @keycode 'x'
@@ -422,7 +342,6 @@ class @Sahli
when @keycode 'i'
$('div.infobox').toggle()
when @keycode 'v'
- $('h6').show()
$('h6').height( (window.innerHeight - $('.scrolly').height()) / 2 )
when @keycode '1'
@changespeed 1
@@ -437,10 +356,6 @@ class @Sahli
@scroll_speed = 4
when @keycode '5'
@changespeed 5
- when @keycode '8'
- @increaseFont($('pre'), -2)
- when @keycode '9'
- @increaseFont($('pre'), 2)
when 40 # down
@moveline 1
when 38 # up
diff --git a/sahli.css b/sahli.css
index a47845b..b0a213a 100644
--- a/sahli.css
+++ b/sahli.css
@@ -10,10 +10,6 @@ body {
border: none;
}
-pre {
- line-height: 100%;
-}
-
#top {
border: 1px solid green;
color: green;
@@ -44,7 +40,7 @@ h6 {
.help {
position: fixed;
top: 1em;
- left: 25%;
+ left: 33%;
text-align: left;
background-color: lightgrey;
border: outset darkgray;
@@ -53,19 +49,7 @@ h6 {
border-radius: 8px;
font-family: topaz1200,mOsOul, Consolas, monospace;
opacity: .85;
- width: 50%;
-}
-
-.fullwidth {
- width: 100%;
-}
-
-.bestfit {
- padding: 0;
- display: block;
- margin: 0 auto;
- max-width: 100%;
- max-height: 100%;
+ width: 33%;
}
.keylist {
diff --git a/sahli.js b/sahli.js
index 8168d21..4dd5734 100644
--- a/sahli.js
+++ b/sahli.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.3
+// Generated by CoffeeScript 1.9.0
/*
.___________________________________, ___
@@ -16,9 +16,7 @@ l__________/__________|___|______l__________j_____j
(function() {
this.Sahli = (function() {
- function Sahli() {
- $('body').css('cursor', 'none');
- }
+ function Sahli() {}
Sahli.loadpic = function(picdata, inserthere) {
switch (picdata.filetype) {
@@ -42,8 +40,6 @@ l__________/__________|___|______l__________j_____j
return this.loadhugeansi(picdata, inserthere);
case 'tundra':
return this.loadhugeansi(picdata, inserthere);
- case 'image':
- return this.loadpicture(picdata, inserthere);
default:
return this.loadplain(picdata, inserthere);
}
@@ -59,7 +55,6 @@ l__________/__________|___|______l__________j_____j
'margin': '0 auto'
});
ptxt = $('
');
- ptxt.addClass('plaintext');
color = this.calccolor(picdata.color);
bgcolor = this.calccolor(picdata.bg);
pdiv.addClass('scrolly');
@@ -70,6 +65,9 @@ l__________/__________|___|______l__________j_____j
'margin': 'auto',
'display': 'inline-block'
});
+ ptxt.width(picdata.width * 8);
+ this.origwidth = ptxt.width;
+ pdiv.width(ptxt.width);
pdiv.prepend(buf.clone());
pdiv.append(ptxt);
pdiv.append(buf);
@@ -89,91 +87,6 @@ l__________/__________|___|______l__________j_____j
return req.send(null);
};
- Sahli.increaseFont = function(node, increaseBy) {
- var current_size;
- if (increaseBy == null) {
- increaseBy = 5;
- }
- current_size = parseInt($(node).css("font-size"));
- return $(node).css("font-size", current_size + increaseBy);
- };
-
- Sahli.loadpicture = function(picdata, inserthere) {
- var fname, pdiv, pimg;
- fname = this.location + '/' + picdata.file;
- pdiv = $('');
- pdiv.addClass('scrolly');
- pdiv.addClass('image');
- pdiv.width(window.innerWidth);
- pdiv.css('display', 'inline-block');
- pimg = $('
');
- pimg.addClass('fullwidth');
- pdiv.append(pimg);
- inserthere.after(pdiv);
- $('h6').hide();
- $('body').scrollTop(0);
- this.origwidth = picdata.width;
- this.origheight = picdata.height;
- return this.bestfit();
- };
-
- Sahli.fullwidthplain = function() {
- if ($('pre').css("font-size") === "16px") {
- return $('pre').css("font-size", "2.5vw");
- } else {
- return $('pre').css("font-size", "16px");
- }
- };
-
- Sahli.togglefullwidthmode = function() {
- if ($('pre').hasClass('plaintext')) {
- return Sahli.fullwidthplain();
- } else {
- if ($('div.scrolly').hasClass('image')) {
- return Sahli.bestfit();
- } else {
- return Sahli.zoom();
- }
- }
- };
-
- Sahli.zoomin = function() {
- if ($('pre').hasClass('plaintext')) {
- return Sahli.increaseFont($('pre'), 2);
- } else {
- return Sahli.zoom(100);
- }
- };
-
- Sahli.zoomout = function() {
- if ($('pre').hasClass('plaintext')) {
- return Sahli.increaseFont($('pre'), -2);
- } else {
- return Sahli.zoom(-100);
- }
- };
-
- Sahli.bestfit = function() {
- if ($('div.scrolly').hasClass('image')) {
- if ($('div.scrolly').hasClass('bestfitMode')) {
- $('div.scrolly').removeClass('bestfitMode');
- $('div.scrolly').addClass('fullwidthMode');
- $('div.scrolly').width(window.innerWidth);
- $('div.scrolly').height("");
- $('img.bestfit').addClass('fullwidth');
- return $('img.bestfit').removeClass('bestfit');
- } else {
- $('h6').hide();
- $('div.scrolly').addClass('bestfitMode');
- $('div.scrolly').removeClass('fullwidthMode');
- $('div.scrolly').width(window.innerWidth);
- $('div.scrolly').height(window.innerHeight);
- $('img.fullwidth').addClass('bestfit');
- return $('img.fullwidth').removeClass('fullwidth');
- }
- }
- };
-
Sahli.loadhugeansi = function(picdata, inserthere) {
var calcheight, canvwidth, fname, pdiv;
fname = this.location + '/' + picdata.file;
@@ -198,8 +111,7 @@ l__________/__________|___|______l__________j_____j
return pdiv.width(canvwidth);
};
})(this)), 30, {
- 'bits': '8',
- "font": picdata.font
+ 'bits': '8'
});
};
@@ -249,7 +161,6 @@ l__________/__________|___|______l__________j_____j
filedata = Sahli.filedata;
filedata[i].pic = $('
' + filedata[i].file + '
');
viewbox.append(filedata[i].pic);
- $('h6').show();
Sahli.loadpic(filedata[i], filedata[i].pic);
Sahli.currentpic += 1;
if (Sahli.currentpic > filedata.length - 1) {
@@ -261,16 +172,6 @@ l__________/__________|___|______l__________j_____j
return Sahli.loadinfopanel(i);
};
- Sahli.prevpic = function() {
- var i;
- i = Sahli.currentpic - 2;
- if (i < 0) {
- i = i + Sahli.filedata.length;
- }
- Sahli.currentpic = i;
- return Sahli.nextpic();
- };
-
Sahli.togglefullscreen = function() {
var docElm;
docElm = document.documentElement;
@@ -369,7 +270,7 @@ l__________/__________|___|______l__________j_____j
zoomee.width(newwidth);
return $('canvas').width(newwidth);
} else {
- if (parseInt(zoomee.width(), 10) !== parseInt(this.origwidth, 10)) {
+ if (zoomee.width() !== this.origwidth) {
zoomee.width(this.origwidth);
return $('canvas').width('100%');
} else {
@@ -380,7 +281,7 @@ l__________/__________|___|______l__________j_____j
};
Sahli.panelmode = function() {
- var canvs, ct, drawcol, j, k, len, len1, level, newheight, newwidth, numcols, numpanels, outer, panelratio, panelslotheight, panelsperslot, pic, picdpercol, results, screenratio, wh, ww, x;
+ var canvs, ct, drawcol, level, newheight, newwidth, numcols, numpanels, outer, panelratio, panelslotheight, panelsperslot, pic, picdpercol, screenratio, wh, ww, x, _i, _j, _len, _len1, _results;
$('#panel').toggle();
canvs = $('canvas');
$('.scrolly').width(this.origwidth);
@@ -408,9 +309,9 @@ l__________/__________|___|______l__________j_____j
drawcol = 1;
ct = 0;
outer.append(this.createpanel(1, newwidth - 6));
- results = [];
- for (j = 0, len = canvs.length; j < len; j++) {
- pic = canvs[j];
+ _results = [];
+ for (_i = 0, _len = canvs.length; _i < _len; _i++) {
+ pic = canvs[_i];
$("#column" + drawcol).append(pic);
level += 1;
ct += 1;
@@ -418,19 +319,19 @@ l__________/__________|___|______l__________j_____j
level = 0;
drawcol = drawcol + 1;
if (ct < numpanels) {
- results.push(outer.append(this.createpanel(drawcol, newwidth - 6)));
+ _results.push(outer.append(this.createpanel(drawcol, newwidth - 6)));
} else {
- results.push(void 0);
+ _results.push(void 0);
}
} else {
- results.push(void 0);
+ _results.push(void 0);
}
}
- return results;
+ return _results;
} else {
$('#outbox').show();
- for (k = 0, len1 = canvs.length; k < len1; k++) {
- pic = canvs[k];
+ for (_j = 0, _len1 = canvs.length; _j < _len1; _j++) {
+ pic = canvs[_j];
$('.scrolly').append(pic);
}
canvs.width(this.origwidth);
@@ -473,26 +374,24 @@ l__________/__________|___|______l__________j_____j
switch (ev.which) {
case _this.keycode(' '):
return _this.nextpic();
- case _this.keycode('p'):
- return _this.prevpic();
case _this.keycode('f'):
return _this.togglefullscreen();
case _this.keycode('s'):
return _this.setscroll();
case _this.keycode('t'):
$('body').scrollTop(0);
- return _this.togglefullwidthmode();
+ return _this.zoom(0);
case _this.keycode('b'):
return $('body').scrollTop($('body').height());
case _this.keycode('a'):
$('body').stop();
return _this.scroll_direction = -_this.scroll_direction;
case _this.keycode('z'):
- return _this.togglefullwidthmode();
+ return _this.zoom();
case _this.keycode('e'):
- return _this.zoomin();
+ return _this.zoom(100);
case _this.keycode('r'):
- return _this.zoomout();
+ return _this.zoom(-100);
case _this.keycode('w'):
return _this.changescrolldirection(-1);
case _this.keycode('x'):
@@ -502,7 +401,6 @@ l__________/__________|___|______l__________j_____j
case _this.keycode('i'):
return $('div.infobox').toggle();
case _this.keycode('v'):
- $('h6').show();
return $('h6').height((window.innerHeight - $('.scrolly').height()) / 2);
case _this.keycode('1'):
return _this.changespeed(1);
@@ -517,10 +415,6 @@ l__________/__________|___|______l__________j_____j
return _this.scroll_speed = 4;
case _this.keycode('5'):
return _this.changespeed(5);
- case _this.keycode('8'):
- return _this.increaseFont($('pre'), -2);
- case _this.keycode('9'):
- return _this.increaseFont($('pre'), 2);
case 40:
return _this.moveline(1);
case 38:
diff --git a/sahliEditorPython/__init__.py b/sahliEditorPython/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sahliEditorPython/sahlifile.py b/sahliEditorPython/sahlifile.py
deleted file mode 100644
index 598614e..0000000
--- a/sahliEditorPython/sahlifile.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-# coding:utf-8
-"""
- Author: Sir Garbagetruck --
- Purpose: base class for Sahli file
- Created: 2020/04/09
-"""
-
-import json
-########################################################################
-
-
-class sahlifile:
- """the Sahli file structure and classes to futz with"""
-
- # ----------------------------------------------------------------------
- def __init__(self, filename):
- """Constructor"""
- self.valid_filetypes = [
- "plain",
- "ansi",
- "xbin",
- "ice",
- "adf",
- "avatar",
- "bin",
- "idf",
- "pcboard",
- "tundra"
- ]
- self.valid_fonts = [
- 'Propaz', 'ansifont', 'mOsOul', 'Microknight', 'p0t-nOodle'
- ]
- if filename is not None:
- with open(filename) as f:
- self.sahli = json.load(f)
- else:
- location = self.blank_location()
- slides = self.blank_slides()
- filedata = []
- self.sahli = {
- 'location': location,
- 'slides': slides,
- 'filedata': filedata
- }
-
- def blank_slides(self):
- """blank slide structure"""
- slides = {
- 'background': '',
- 'template': '',
- 'css': ''
- }
- return slides
-
- def blank_location(self):
- """blank location structure"""
- return ''
-
- def blank_picture(self):
- """Blank picture structure"""
- return {
- 'file': '',
- 'name': '',
- 'amiga': False,
- 'filetype': 'image',
- 'width': '1600',
- 'author': '',
- 'font': 'Propaz',
- 'color': [0, 0, 0, 255],
- 'bg': [255, 255, 255, 255],
- 'line1': '',
- 'line2': '',
- 'text': ''
- }
- # ----------------------------------------------------------------------
-
- def blank_amiga_ascii(self):
- """blank amiga ascii"""
- return {
- 'file': '',
- 'name': '',
- 'amiga': True,
- 'filetype': 'plain',
- 'width': '80',
- 'author': '',
- 'font': 'Propaz',
- 'color': [250, 250, 250, 255],
- 'bg': [0, 0, 0, 255],
- 'line1': '',
- 'line2': '',
- 'text': ''
- }
- # ----------------------------------------------------------------------
-
- def blank_ansi(self):
- """blank PC Ansi"""
- return {
- 'file': '',
- 'name': '',
- 'amiga': False,
- 'filetype': 'ansi',
- 'width': '80',
- 'author': '',
- 'font': 'Propaz',
- 'color': [255, 255, 255, 255],
- 'bg': [0, 0, 0, 255],
- 'line1': '',
- 'line2': '',
- 'text': ''
- }
-
- def blank_filedata(self):
- """Blank filedata structure"""
-
- filedata = {
- 'file': '',
- 'name': '',
- 'amiga': False,
- 'filetype': 'image',
- 'width': '',
- 'author': '',
- 'font': 'Propaz',
- 'color': [0, 0, 0, 255],
- 'bg': [255, 255, 255, 255],
- 'line1': '',
- 'line2': '',
- 'text': ''
- }
- return filedata
diff --git a/sauce.py b/sauce.py
deleted file mode 100644
index 00a6408..0000000
--- a/sauce.py
+++ /dev/null
@@ -1,510 +0,0 @@
-#! /usr/bin/env python
-#
-# _______
-# ____________ _______ _\__ /_________ ___ _____
-# | _ _ \ _ | ____\ _ / | |/ _ \
-# | / / / / | | | /___/ _ | | / /
-# |___/___/ /___/____|________|___ | |_| |___|_____/
-# \__/ |___|
-#
-# (c) 2006-2012 Wijnand Modderman-Lenstra - https://maze.io/
-#
-
-'''
-Parser for SAUCE or Standard Architecture for Universal Comment Extensions.
-'''
-
-__author__ = 'Wijnand Modderman-Lenstra '
-__copyright__ = '(C) 2006-2012 Wijnand Modderman-Lenstra'
-__license__ = 'LGPL'
-__version__ = '1.2'
-__url__ = 'https://github.com/tehmaze/sauce'
-
-import datetime
-import os
-import struct
-try:
- from io import StringIO
-except ImportError:
- from io import StringIO
-
-
-class SAUCE(object):
- '''
- Parser for SAUCE or Standard Architecture for Universal Comment Extensions,
- as defined in http://www.acid.org/info/sauce/s_spec.htm.
-
- :param filename: file name or file handle
- :property author: Name or 'handle' of the creator of the file
- :property datatype: Type of data
- :property date: Date the file was created
- :property filesize: Original filesize NOT including any information of
- SAUCE
- :property group: Name of the group/company the creator is employed by
- :property title: Title of the file
-
- Example::
-
- >>> art = open('31337.ANS', 'rb')
- >>> nfo = sauce.SAUCE(art)
- >>> nfo.author
- 'maze'
- ...
- >>> nfo.group
- ''
- >>> nfo.group = 'mononoke'
- >>> raw = str(nfo)
-
- Saving the new file::
-
- >>> sav = open('31337.NEW', 'wb')
- >>> nfo.write(sav)
- >>> # OR you can do:
- >>> sav = nfo.write('31337.NEW')
-
- '''
-
- # template
- template = (
- # name default size type
- ('SAUCE', 'SAUCE', 5, '5s'),
- ('SAUCEVersion', '00', 2, '2s'),
- ('Title', '\x00' * 35, 35, '35s'),
- ('Author', '\x00' * 20, 20, '20s'),
- ('Group', '\x00' * 20, 20, '20s'),
- ('Date', '\x00' * 8, 8, '8s'),
- ('FileSize', [0], 4, 'I'),
- ('DataType', [0], 1, 'B'),
- ('FileType', [0], 1, 'B'),
- ('TInfo1', [0], 2, 'H'),
- ('TInfo2', [0], 2, 'H'),
- ('TInfo3', [0], 2, 'H'),
- ('TInfo4', [0], 2, 'H'),
- ('Comments', [0], 1, 'B'),
- ('Flags', [0], 1, 'B'),
- ('Filler', ['\x00'] * 22, 22, '22c'),
- )
- templates = [t[0] for t in template]
- datatypes = ['None', 'Character', 'Graphics', 'Vector', 'Sound',
- 'BinaryText', 'XBin', 'Archive', 'Executable']
- filetypes = {
- 'None': {
- 'filetype': ['Undefined'],
- },
- 'Character': {
- 'filetype': ['ASCII', 'ANSi', 'ANSiMation', 'RIP', 'PCBoard',
- 'Avatar', 'HTML', 'Source'],
- 'flags': {0: 'None', 1: 'iCE Color'},
- 'tinfo': (
- ('width', 'height', None, None),
- ('width', 'height', None, None),
- ('width', 'height', None, None),
- ('width', 'height', 'colors', None),
- ('width', 'height', None, None),
- ('width', 'height', None, None),
- (None, None, None, None),
- ),
- },
- 'Graphics': {
- 'filetype': ['GIF', 'PCX', 'LBM/IFF', 'TGA', 'FLI', 'FLC',
- 'BMP', 'GL', 'DL', 'WPG', 'PNG', 'JPG', 'MPG',
- 'AVI'],
- 'tinfo': (('width', 'height', 'bpp')) * 14,
- },
- 'Vector': {
- 'filetype': ['DX', 'DWG', 'WPG', '3DS'],
- },
- 'Sound': {
- 'filetype': ['MOD', '669', 'STM', 'S3M', 'MTM', 'FAR', 'ULT',
- 'AMF', 'DMF', 'OKT', 'ROL', 'CMF', 'MIDI', 'SADT',
- 'VOC', 'WAV', 'SMP8', 'SMP8S', 'SMP16', 'SMP16S',
- 'PATCH8', 'PATCH16', 'XM', 'HSC', 'IT'],
- 'tinfo': ((None,)) * 16 + (('Sampling Rate',)) * 4,
- },
- 'BinaryText': {
- 'flags': {0: 'None', 1: 'iCE Color'},
- },
- 'XBin': {
- 'tinfo': (('width', 'height'),),
- },
- 'Archive': {
- 'filetype': ['ZIP', 'ARJ', 'LZH', 'ARC', 'TAR', 'ZOO', 'RAR',
- 'UC2', 'PAK', 'SQZ'],
- },
- }
-
- def __init__(self, filename='', data=''):
- assert (filename or data), 'Need either filename or record'
-
- if filename:
- # if type(filename) == file:
- # self.filehand = filename
- # else:
- self.filehand = open(filename, 'rb')
- self._size = os.path.getsize(self.filehand.name)
- else:
- self._size = len(data)
- self.filehand = StringIO(data)
-
- self.record, self.data = self._read()
-
- def __str__(self):
- return ''.join(list(self._read_file()))
-
- def _read_file(self):
- # Buffered reader (generator), reads the original file without SAUCE
- # record.
- self.filehand.seek(0)
- # Check if we have SAUCE data
- if self.record:
- reads, rest = divmod(self._size - 128, 1024)
- else:
- reads, rest = divmod(self._size, 1024)
- for x in range(0, reads):
- yield self.filehand.read(1024)
- if rest:
- yield self.filehand.read(rest)
-
- def _read(self):
- if self._size >= 128:
- self.filehand.seek(self._size - 128)
- record = self.filehand.read(128)
- if record.startswith(b'SAUCE'):
- self.filehand.seek(0)
- return record, self.filehand.read(self._size - 128)
-
- self.filehand.seek(0)
- return None, self.filehand.read()
-
- def _gets(self, key):
- if self.record is None:
- return None
-
- name, default, offset, size, stype = self._template(key)
- data = self.record[offset:offset + size]
- data = struct.unpack(stype, data)
- if stype[-1] in 'cs':
- # return ''.join(data)
- return data[0].decode()
- elif stype[-1] in 'BI' and len(stype) == 1:
- return data[0]
- else:
- return data
-
- def _puts(self, key, data):
- name, default, offset, size, stype = self._template(key)
- #print offset, size, data, repr(struct.pack(stype, data))
- if self.record is None:
- self.record = self.sauce()
- self.record = ''.join([
- self.record[:offset],
- struct.pack(stype, data),
- self.record[offset + size:]
- ])
- return self.record
-
- def _template(self, key):
- index = self.templates.index(key)
- name, default, size, stype = self.template[index]
- offset = sum([self.template[x][2] for x in range(0, index)])
- return name, default, offset, size, stype
-
- def sauce(self):
- '''
- Get the raw SAUCE record.
- '''
- if self.record:
- return self.record
- else:
- data = 'SAUCE'
- for name, default, size, stype in self.template[1:]:
- #print stype, default
- if stype[-1] in 's':
- data += struct.pack(stype, default)
- else:
- data += struct.pack(stype, *default)
- return data
-
- def write(self, filename):
- '''
- Save the file including SAUCE data to the given file(handle).
- '''
- filename = type(filename) == file and filename or open(
- filename, 'wb')
- for part in self._read_file():
- filename.write(part)
- filename.write(self.sauce())
- return filename
-
- # SAUCE meta data
-
- def get_author(self):
- astr = self._gets('Author')
- if astr is not None:
- return astr.strip()
- else:
- return ''
-
- def set_author(self, author):
- self._puts('Author', author)
- return self
-
- def get_comments(self):
- return self._gets('Comments')
-
- def set_comments(self, comments):
- self._puts('Comments', comments)
- return self
-
- def get_datatype(self):
- return self._gets('DataType')
-
- def get_datatype_str(self):
- datatype = self.datatype
- if datatype is None:
- return None
- if datatype < len(self.datatypes):
- return self.datatypes[datatype]
- else:
- return None
-
- def set_datatype(self, datatype):
- if type(datatype) == str:
- datatype = datatype.lower().title() # fOoBAR -> Foobar
- datatype = self.datatypes.index(datatype)
- self._puts('DataType', datatype)
- return self
-
- def get_date(self):
- return self._gets('Date')
-
- def get_date_str(self, format='%Y%m%d'):
- return datetime.datetime.strptime(self.date, format)
-
- def set_date(self, date=None, format='%Y%m%d'):
- if date is None:
- date = datetime.datetime.now().strftime(format)
- elif type(date) in [datetime.date, datetime.datetime]:
- date = date.strftime(format)
- elif type(date) in [int, int, float]:
- date = datetime.datetime.fromtimestamp(date).strftime(format)
- self._puts('Date', date)
- return self
-
- def get_filesize(self):
- return self._gets('FileSize')
-
- def set_filesize(self, size):
- self._puts('FileSize', size)
-
- def get_filler(self):
- return self._gets('Filler')
-
- def get_filler_str(self):
- filler = self._gets('Filler')
- if filler is None:
- return ''
- else:
- return filler.rstrip('\x00')
-
- def get_filetype(self):
- return self._gets('FileType')
-
- def get_filetype_str(self):
- datatype = self.datatype_str
- filetype = self.filetype
-
- if datatype is None or filetype is None:
- return None
-
- if datatype in self.filetypes and \
- 'filetype' in self.filetypes[datatype] and \
- filetype < len(self.filetypes[datatype]['filetype']):
- return self.filetypes[datatype]['filetype'][filetype]
- else:
- return None
-
- def set_filetype(self, filetype):
- datatype = self.datatype_str
- if type(filetype) == str:
- filetype = filetype.lower().title() # fOoBAR -> Foobar
- filetype = [name.lower().title()
- for name in self.filetypes[datatype]['filetype']].index(filetype)
- self._puts('FileType', filetype)
- return self
-
- def get_flags(self):
- return self._gets('Flags')
-
- def set_flags(self, flags):
- self._puts('Flags', flags)
- return self
-
- def get_flags_str(self):
- datatype = self.datatype_str
- filetype = self.filetype
-
- if datatype is None or filetype is None:
- return None
-
- if datatype in self.filetypes and \
- 'flags' in self.filetypes[datatype] and \
- filetype < len(self.filetypes[datatype]['filetype']):
- return self.filetypes[datatype]['filetype'][filetype]
- else:
- return None
-
- def get_group(self):
- gstr = self._gets('Group')
- if gstr is not None:
- return gstr.strip()
- else:
- return ''
-# return self._gets('Group').strip()
-
- def set_group(self, group):
- self._puts('Group', group)
- return self
-
- def _get_tinfo_name(self, i):
- datatype = self.datatype_str
- filetype = self.filetype
-
- if datatype is None or filetype is None:
- return None
-
- try:
- return self.filetypes[datatype]['tinfo'][filetype][i - 1]
- except (KeyError, IndexError):
- return ''
-
- def get_tinfo1(self):
- tinfo = self._gets('TInfo1')
- if tinfo is not None:
- return tinfo[0]
- else:
- return ''
-
- def get_tinfo1_name(self):
- return self._get_tinfo_name(1)
-
- def set_tinfo1(self, tinfo):
- self._puts('TInfo1', tinfo)
- return self
-
- def get_tinfo2(self):
- tinfo = self._gets('TInfo2')
- if tinfo is not None:
- return tinfo[0]
- else:
- return ''
-
- def get_tinfo2_name(self):
- return self._get_tinfo_name(2)
-
- def set_tinfo2(self, tinfo):
- self._puts('TInfo2', tinfo)
- return self
-
- def get_tinfo3(self):
- tinfo = self._gets('TInfo3')
- if tinfo is not None:
- return tinfo[0]
- return ''
-
- def get_tinfo3_name(self):
- return self._get_tinfo_name(3)
-
- def set_tinfo3(self, tinfo):
- self._puts('TInfo3', tinfo)
- return self
-
- def get_tinfo4(self):
- tinfo = self._gets('TInfo4')
- if tinfo is not None:
- return tinfo[0]
- return ''
-
- def get_tinfo4_name(self):
- return self._get_tinfo_name(4)
-
- def set_tinfo4(self, tinfo):
- self._puts('TInfo4', tinfo)
- return self
-
- def get_title(self):
- tstr = self._gets('Title')
- if tstr is not None:
- return tstr.strip()
- else:
- return ''
-# return self._gets('Title').strip()
-
- def set_title(self, title):
- self._puts('Title', title)
- return self
-
- def get_version(self):
- return self._gets('SAUCEVersion')
-
- def set_version(self, version):
- self._puts('SAUCEVersion', version)
- return self
-
- # properties
- author = property(get_author, set_author)
- comments = property(get_comments, set_comments)
- datatype = property(get_datatype, set_datatype)
- datatype_str = property(get_datatype_str)
- date = property(get_date, set_date)
- filesize = property(get_filesize, set_filesize)
- filetype = property(get_filetype, set_filetype)
- filetype_str = property(get_filetype_str)
- filler = property(get_filler)
- filler_str = property(get_filler_str)
- flags = property(get_flags, set_flags)
- flags_str = property(get_flags_str)
- group = property(get_group, set_group)
- tinfo1 = property(get_tinfo1, set_tinfo1)
- tinfo1_name = property(get_tinfo1_name)
- tinfo2 = property(get_tinfo2, set_tinfo2)
- tinfo2_name = property(get_tinfo2_name)
- tinfo3 = property(get_tinfo3, set_tinfo3)
- tinfo3_name = property(get_tinfo3_name)
- tinfo4 = property(get_tinfo4, set_tinfo4)
- tinfo4_name = property(get_tinfo4_name)
- title = property(get_title, set_title)
- version = property(get_version)
-
-
-if __name__ == '__main__':
- import sys
- if len(sys.argv) != 2:
- print('%s ' % (sys.argv[0],), file=sys.stderr)
- sys.exit(1)
- else:
- test = SAUCE(sys.argv[1])
-
- def show(sauce):
- print('Version.:', sauce.version)
- print('Title...:', sauce.title)
- print('Author..:', sauce.author)
- print('Group...:', sauce.group)
- print('Date....:', sauce.date)
- print('FileSize:', sauce.filesize)
- print('DataType:', sauce.datatype, sauce.datatype_str)
- print('FileType:', sauce.filetype, sauce.filetype_str)
- print('TInfo1..:', sauce.tinfo1)
- print('TInfo2..:', sauce.tinfo2)
- print('TInfo3..:', sauce.tinfo3)
- print('TInfo4..:', sauce.tinfo4)
- print('Flags...:', sauce.flags, sauce.flags_str)
- print('Record..:', len(sauce.record), repr(sauce.record))
- print('Filler..:', sauce.filler_str)
-
- if test.record:
- show(test)
- else:
- print('No SAUCE record found')
- test = SAUCE(data=test.sauce())
- show(test)
diff --git a/setup.py b/setup.py
deleted file mode 100644
index fe18ef9..0000000
--- a/setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# coding:utf-8
-"""
- Author: Sir Garbagetruck --
- Purpose: setup script for Sahli editor tools
- Created: 2020/04/09
-"""
-
-from setuptools import setup, find_packages
-
-setup(
- name="SahliEditor",
- version="0.1",
- packages=find_packages()
-)
diff --git a/testshow/AD - Green Beam.scaled.png b/testshow/AD - Green Beam.scaled.png
deleted file mode 100644
index fbecb25..0000000
Binary files a/testshow/AD - Green Beam.scaled.png and /dev/null differ
diff --git a/testshow/om-boss.png b/testshow/om-boss.png
deleted file mode 100644
index e3abd45..0000000
Binary files a/testshow/om-boss.png and /dev/null differ
diff --git a/todo.txt b/todo.txt
index f29534b..f26a2e7 100644
--- a/todo.txt
+++ b/todo.txt
@@ -7,4 +7,3 @@
(C) SAHLI ansi & ascii for load page
(C) redo load page (not popup, info)
(B) Preload
-(C) Chrome app