From 7043cad015c7b8680462151eabaad399f6012053 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Tue, 16 May 2023 17:27:09 +0200
Subject: [PATCH] fix fsr sharpening regardless of cli option

---
 bin/__pycache__/handler.cpython-311.pyc | Bin 28268 -> 29170 bytes
 bin/handler.py                          |  36 ++++++++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/bin/__pycache__/handler.cpython-311.pyc b/bin/__pycache__/handler.cpython-311.pyc
index 1cbd7ff61a74cdf250629687963a20d2801677bf..b1a1096fc2a51af1cea3c28f770ca2619ffb865f 100644
GIT binary patch
delta 1847
zcmd6lT}&KR6oBvDVcD74?hkb6wo9o{DX>|oNTb981!R{lMKCi9H3(IpL-&X7QfGHd
zg=uMG(rDrj&8g8^u=raHKGdu)ebYpeHonZRTQNipMorZ80ZrAInCQLxqhO%g#0MvL
zzI*OH=bn4+Ip@Y__{XoX`I5=RBl5|!hh>lSuKDY|x-AyCx%Y}KU)GH<RHgi`=F2E6
z{|fKaJ23+TttB`Qey(pc=v90H$@#F{(74U;7Di~E{F#sJvnordhpC44tR+V+hc~pG
z;nw=V=$We=il!sUcnxmK`A^@>&*=VsVhV@ZJ5kgQU)FBsej7t4m|ir7H;CN$uOr_?
zEj#|Z$W8EEr47?4x5LwR)4h2kI{Gq&mCY)8%$$2=*dSY0uVsd;EIBQF(KuOPRZ-BI
z+adWbfT<P-RM-k&ZeK{RBldP!-Y3BBrg>7kN827JwcyAZGc4B&@gvO`*JX=6#VD@7
z%1u^H(aM}-(j}WWxTp|5YAMA$+-Rw!*Y3Dw#a6%j_ygbl*-fWf?}vcPn(dQ+s!O@c
zZ7U+-7;@p!K1+8*x=y#~#ZO#i)wh*vD0j!!$zlv=^7m~Ui_J3fBFC04g_cmshoAOW
zl`ZLFk#T+GaDTu@r@I3_rI%;}&36z?s|bP9Qw@hac3v5xr|bj(o&$EJl`dTbOI&F1
z#L?lfFX~@nj*Uj*zjz9;&dUOSplg@0=%vD>u~;(}&+>C}vb0t!t^Ks5Z2Hg&(wk1<
z456*7deWykCoV_ddxA`4ykD1@uS-4J!ADXD2NTjzN*Y>}{7K2L1%e4_BqfbxY_!p_
ztl*qT2q#m*Ni98=g{|kh76nIAaLf_!;~DScM55m5d|m9;dU{hm0}1h-!IU_-DEgA3
zPxA*7VlX8JGe%nYcvf(ZCj>Pms9Ji!+nvQY0SlcKmYx5<_w2dt_pIc>d}ou+TnKF)
zJFz)_sbdcF*{UT<YvT`fUSXO^`N)XeN9z7zoy~1U3s&A;!YpjZgjZ{9?JT;+^6f>;
zH31VQ%WYBvN;dFbj`^6yUJh!+Z??s-e#Z)0hw<G~5Mw2N-h0fT3;4j;*NxA@K;QmW
zpxt(k;spwkLLzWjlqadYi=u*p^ej>)DL8^9!;!$z;n7%BISt?Ux$%oo(_g}$p=t^>
z{&4^2yzx9;zf5rfntXfkG(>!7yl3gg48<!H7YWu}xArEbiW<#QoThk{;x&rbDc+!X
z6CU)}@lR2a;)D3J{)s#cz=iHIrejL0o`>epR(u(HLl<kh^_Zk;eg2T%zqwi)hN`gZ
E4~Yo~SO5S3

delta 1363
zcma)+ZD><h7{|}KNt*ZcMys(Uu?ne4L9yKgQJWfVQrmR7+RhgyeR1ne(j?W!n<hq$
zRAFoirK^3qt!RDQ2PX(ajgBekmywUwn-FLTlR5UnHa4v<A5{F{Ik^p_Ak@RTzw?~u
z{O|KT=eZ=$e#ig)f(_s6^%_LR^K-rYo$c2Re{3v!twZQr1S75*uxuIyuiF4=hZ!?4
zyUBuOV~q}_Jc-XDUIG6$Ix5R9V}!1fM;gShOsWXwaHg?!PN`Zz>D*kgFNs2`Vh~;y
zW~eQwcy$u>kb0zXK*?)L_dG*(`r@e?4a$l(LLo!ZE)=VU5t|7whu=Oh!{3{Sj5?B!
zEh<R4dPq2Hu>rnw9>e9ZV$09uzVViWN=1@X5YoYMcSS0)6=Q9AxR7L2COBZP(}IgH
zW}E7<7UV7)39{N%T|Pg(u_XP7>mR9^>f$v&fgR2DrbQ%?vZN%b%ZnH2T|=`Q9=O@L
zPA^$N{kVDMnqt=XYA!Tvi<LAah6}B@(W=6V+NGSpz*3Lh5Oh`}6r4;VlxJd5=<%#!
zgfckgv6%Brv`_eqT<VA-+SeHj2vu|T+F$^#c|28l_5M#2{k{W%!M?mKG7uG-h(K@=
zq$=8sn0ZqMwvV`>O3S2W7Ae$6u*8$D;no=)d$Mh~ZK6J-GgD*6xMbXX(UdjXMWcO&
ztr#~<vo%?^=88?U9lEye<_5Bm`4a`1_j|>T-MNmg4A-6Gx~Dll%kiSmpWy;IE+9$7
za8xpe$dX|X=h(wyVLqB4JuXF$i?%q8PS^V%i|xB|?VTBKSI*lt?d{Eadqv)t@%nRK
zza$Yu!kl4?XV^rJO^Aj0NN*hOoY<4qTSdKf#<G&!6<%_S;QtK{W|mE9w_m}jyE|^n
z>`^OeQ(9+oTT$Aoao5Yzb(nB!nTe}IQ*|27A)9KzoCAK``DbMiE0)iqcQAExR|sQ&
zs(MdE$@mg*x_c)cgTK1BHI36x@ioOa6zvop1hwVD=hUvDSVeJ+;y8txAg}ZX`+Wnk
zLE!{Mdff5};)5sQD$SQvK@mwk?0Klso}v4*6qAq+eTdJ&tI!u4$Ef2x#RZCs1oJY^
zPbS!@=n};VxED4t!ez*Y*K1Bu55=w2;{Ky@JPuz)R$B`d6plveIsFF^=r8rPs$u^C
hAM5uu3fJM+$c4HV1t#r!H=h>#FG^2$!w&~tZvpIqd=vlx

diff --git a/bin/handler.py b/bin/handler.py
index d85b60d..68b640b 100644
--- a/bin/handler.py
+++ b/bin/handler.py
@@ -254,12 +254,29 @@ class Handler:
         self.filelist.pop(0)
         self.filelist.sort()
         self.number = 0
-        for self.file in self.filelist:
-            self.number += 1
-            if ( self.os_type == 'win32' ):
-                self.file_list.append( f"{tmppath}{self.file} {tmppath}us\\ig{str(self.number).zfill(8)}.{ filetype } " );
-            else:
-                self.file_list.append( f"{tmppath}{self.file} {tmppath}us/ig{str(self.number).zfill(8)}.{ filetype } " );
+        if sharpening != '' and sharpening != None:
+            for self.file in self.filelist:
+                self.number += 1
+                if ( self.os_type == 'win32' ):
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}us\\ig{str(self.number).zfill(8)}.{ filetype } " );
+                else:
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}us/ig{str(self.number).zfill(8)}.{ filetype } " );
+            try:
+                os.mkdir( f'{tmppath}us' )
+            except FileExistsError:
+                pass
+        else:
+            for self.file in self.filelist:
+                self.number += 1
+                if ( self.os_type == 'win32' ):
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}sc\\ig{str(self.number).zfill(8)}.{ filetype } " );
+                else:
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}sc/ig{str(self.number).zfill(8)}.{ filetype } " );
+        
+            try:
+                os.mkdir( f'{tmppath}sc' )
+            except FileExistsError:
+                pass
         
         if ( self.os_type == 'win32' ):
             self.maxlength = 8000
@@ -267,11 +284,6 @@ class Handler:
             self.maxlength = 31900
         self.pos = 1
 
-        try:
-            os.mkdir( f'{tmppath}us' )
-        except FileExistsError:
-            pass
-
         ############################################
         #
         # Thread optimisation: Divide workload up into different threads & upscale using helper function
@@ -303,7 +315,7 @@ class Handler:
             self.pool.close();
             self.pool.join();
 
-        if sharpening != '':
+        if sharpening != '' and sharpening != None:
             print( f'\n\n\n==> Sharpening using { self.threads } threads <==\n\n' );
             time.sleep( 2 );