Skip to content

Commit

Permalink
fix windows, update packages, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
piotrj committed Nov 18, 2023
1 parent 3b3390d commit af554fb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 92 deletions.
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pyinstaller==6.1
nuitka==1.8.4
pyinstaller==6.2.0
nuitka==1.8.6
appdirs==1.4.4
send2trash==1.8.2
zstandard==0.21.0
zstandard==0.22.0
ordered-set==4.1.0
psutil==5.9.6
88 changes: 0 additions & 88 deletions src/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
from os import scandir
from os import stat
from os import sep
from os import getpgid

from os.path import join as path_join
from os.path import abspath
Expand Down Expand Up @@ -538,93 +537,6 @@ def extract_custom_data(self):
self_db.files_cde_size += size
self_db.files_cde_size_extracted += getsizeof(output)

#try:
#shell = False
#output = check_output(cde_run_list, stderr=STDOUT, timeout=timeout,shell=shell,start_new_session=True)
#encoding="ISO-8859-1"
#text=True,

#process = Popen(cde_run_list, start_new_session=True, stdout=PIPE, stderr=STDOUT)

#if timeout:
# process.wait(timeout=timeout)
#else:
# process.wait()

#except TimeoutExpired as et:
#print('timeout on ',cde_run_list)

#try:
# process.terminate()
#except Exception as term_e:
# self.log.error('Custom Data Extraction subprocess timeout termination:%s\n%s',cde_run_list,term_e )
# e_str = str(et) + '\n' + str(term_e)
#else:

#e_str = str(et)

#killpg(getpgid(process.pid), SIGTERM)
#self.log.error('Custom Data Extraction subprocess timeout:%s\n%s',cde_run_list,et )

#cd_ok = False
#is_compressed = False

#e_size = getsizeof(e_str)
#new_list_ref_elem = [cd_ok,is_compressed,e_str]
#list_ref.append( (cd_ok,is_compressed,e_str) )
#self_db.files_cde_errors_quant +=1
#self_db.files_cde_size += e_size

#except Exception as e:
#print('error on ',cde_run_list)
# self.log.error('Custom Data Extraction subprocess error:%s\n%s',cde_run_list,e )

# cd_ok = False
# is_compressed = False

# e_str = str(e)
# e_size = getsizeof(e_str)

# new_list_ref_elem = [cd_ok,is_compressed,e_str]
#list_ref.append( (cd_ok,is_compressed,e_str) )
#print(e_str)

# self_db.files_cde_errors_quant +=1

# self_db.files_cde_size += e_size
#else:
#returncode = process.returncode
#print('returncode:',returncode)

#output, error = process.communicate()
#print(output,type(output))

#cd_ok = True

#output_len = len(output)

#if output_len==0:
# result = None
# is_compressed = False
#elif output_len>128:
#result = gzip.compress(bytes(output,"ISO-8859-1")) #"utf-8"
# result = gzip.compress(output) #"utf-8"
# is_compressed = True
#else:
# result = output.decode("ISO-8859-1")
# is_compressed = False

#new_list_ref_elem = [cd_ok,is_compressed,result]

#if crc:
# new_list_ref_elem.append(crc_val)

#list_ref.append( tuple(new_list_ref_elem) )

#self_db.files_cde_quant += 1
#self_db.files_cde_size += size
#self_db.files_cde_size_extracted += getsizeof(output)

self.info_line_current = ''

del self.custom_data_pool
Expand Down
2 changes: 1 addition & 1 deletion src/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from time import time
from time import sleep

from signal import SIGSTOP,SIGINT,SIGTERM
from signal import SIGTERM
class Executor :
def __init__(self):
self.command_list_to_execute = None
Expand Down
2 changes: 2 additions & 0 deletions src/librer.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,8 @@ def __init__(self,cwd):
style_configure("TCheckbutton", background = self.bg_color)
style_configure("TCombobox", borderwidth=2,highlightthickness=1,bordercolor='darkgray')

style.configure('TRadiobutton', background=self.bg_color)

style_map = style.map

style_map("TButton", relief=[('disabled',"flat"),('',"raised")] )
Expand Down

0 comments on commit af554fb

Please sign in to comment.