From 90e00530fddd96b8254b9a5a87aa8963dbad708c Mon Sep 17 00:00:00 2001
From: janis <jahu04@outlook.com>
Date: Tue, 23 May 2023 09:07:15 +0200
Subject: [PATCH] fix sharpening

---
 bin/__pycache__/handler.cpython-311.pyc | Bin 32788 -> 33211 bytes
 bin/handler.py                          |  34 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bin/__pycache__/handler.cpython-311.pyc b/bin/__pycache__/handler.cpython-311.pyc
index 4ba92ede3778a707c7a838a735a9c0a0b8d363ef..f6eb0be3623338c0d958604371746ac2af49571f 100644
GIT binary patch
delta 1935
zcmcgsVN4rU9Dnbw*IrB8qqL>aLZM-dZ3qi6&5&eRGfmWuEKJn2j8?cY4Nz~_)&af)
z4biwb6YwpLWdZSns9}knmrUYjf*L=VeejMnrXeojgI`88>Eeurn9O(AN?MSZ?1L}4
z-@AMN|Ns4e_j~{MzxX<JV~VnWY_nMa8J+wve<X6vE_6VHJlV0&%nczU4~A&XI8BR#
z^7W%526$cG^VGAj0vWAf(6k5vSRzkuKycv;`NGp~=n;C8!X1{ZZo=kqCMg_D3TsqS
zz{}74P$Kk-PGT9SlY;!-u}cvCEFb7vGO<A_3s_r_!nb>tYDJ{PkaA$+E&z@obx+4^
z0m|<`w?V^U{6^?7Y{5T;AHqtwLk@&RNY^DGUg`7VRIeFs;xBveGYm5ECj4Qtl{j&D
zCGjNACZqVXkcmod;%o6r`BvX$8dk^~Bdrt;2yeNnfwO%2rJ1ISO$+;1%Nmuk#;hOT
z5Z=Y#p1!?3DGr1a`3%2=TIKASdyMfLB1znfH%7jeQ?Y(}zbP+}HW|sIN&4F;S-k`h
zkiZ!rnRqC%gm`nriw`Eu4oaLu0MUpYCugJ0cqZ=midBf^sc{<s61&432mpR7<V~tl
zOQsLWjEv$TWX|hyUv%PIeH@-Y<#RA(KT~eMSld4yEU#zHxgX-q8im6Bc*_u_Z7gch
zCA+ZsFS5{t?<PH_JY}rL>l^i~d{HXNLUbuXv}8?eRT<I4f&+<4F1&NCtpyS9oN79;
z5@ap<w(^uNoi(p4ng31MVlz>eY@1&zRN{Y9wwTQhWsA)L-|l2}&B@_A_L1tzhiw;p
zho}{XR14B0-Ine5J@!b>!sKf7ufF=+x#IO#{fre+ybbq8s>xd5oQGLPrUe=YTrO;D
zDxH*U2_{#c8uE7H%q^0Ov84AKZ4Cls;7jwhX5}3SUIBa=VhGa6b_L8CC3~!v_&D=E
zX5Lj`H4v+#D2Ka%K8}tuWqkQbQ0Rf|_>{N0Zi^SP^PZ~}i=^6@^orM5NgU!9jQVc~
z(FRzFXQR0vEO(`r3peAv`v0#--4FY^L@i#_?xg6`U|xd{G<Z#eDgt*L8gK;GC^0FH
z;q>VDuoTaa`K@af{$;*Lh!4Ctd>Y>zJHnI_uUZ`JcXRKMH&Fuv$q@gX^qljPHcu8X
z=E@A`pNlVasx@utnzmHGT66d-=W;}CKb~$suAJyr+q;#T?lgB&c|N?#g%vKGDRoYt
zonfcxKi3~PG-G#SId&DQIQq)eq`QVNaRf4+y&uIt=~Np!(hVKU{c6Kw-#J$zYOp6A
z>``6_slkxa5K4Q(N@QTwGoW||G8MkrvzOUf!sLNNGvz+KN0@Te7dLa2H1oZrnRnwS
zq)+XvP2mD6TbE|*6t)ikDz&(Lpv3<6x%15znrB;9Emex8>h~%<Jm|+KCgv<RiPBmp
iBHjIui64(W3cFwy6yP{4_{bTKQjbI3ZTCsk&hu|Y^9@=6

delta 796
zcmZvaZAep57{||Z@9uTG+ue)Kx0<>rBf?hVha`I;3JMEFqCV7oDNj1xv~AaAuCq-D
zBB>9;6J?m#r({f`x)4ErEBY2qiLfF``cy$!Q9<~jbJbv0hs&RP&;NIx^FQ}Fk1hyT
z2L=0tsw#w!_GFM&wcN9Z>wxH~x=j{G7n3OoiiSBXMydW_e~(Fjzjp^<bNyPZ-PeTA
z>Sv2Je^=)RGiQE*FD}KjtzDh3g_wp@hn`zCf3$!*aWSUp*A8C?n9+R=nLKj@7KmAm
z0L~xH*f;l1JHs!W;q20*PagXyLKyFK)IyD(J^l*xseoqEOHQ@`lws}pq5JJ=(7oX*
z!0hR_f0Nac`~(QmDssplfFm6?MdnG2!+g8Qi~I0qpV=WqYZzf7%Zu}0z(jNfyy$Iq
zSaN69ON1I;Tk{#roXB70{Y&ow5t{;)T*teMWC{s|FCFw(@a+_+#QB(~oQXjbk3ph~
zjGN1Q$5lc&YGtDSGw=p1E6CkNjC7ac+*ucXZYkqMZLO^!V5oJwlxFfR5!bohsBUov
z61G0csJT3-!USr)%@3Pd>YgzRgqf%<C>ZZi8&w&M5^84>SCQF9$(Wo_d%c`-tS}bp
z%yCWJb@fR&Ug!~N{t=uzS0bsjVA73|P$NE;UHGYA#ko+4E4?a75fgBstr&{2qGtoX
z8+Zy1oQRj>bbL29o+@=*HsTm!=E<~;f4YX=@E4p-rg1p6&0R{Y_DlUkzAL_w>KVn8
yRXpF<;6O(?eoc)j5BXZ&aH19Bjlq`(c0vQcTRED9oR4MWps;I+`oBh<yxMQLZ|FS$

diff --git a/bin/handler.py b/bin/handler.py
index c847e32..edae3f8 100644
--- a/bin/handler.py
+++ b/bin/handler.py
@@ -259,11 +259,11 @@ class Handler:
             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 } " );
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}up\\up{str(self.number).zfill(8)}.{ filetype } " );
                 else:
-                    self.file_list.append( f"{tmppath}{self.file} {tmppath}us/ig{str(self.number).zfill(8)}.{ filetype } " );
+                    self.file_list.append( f"{tmppath}{self.file} {tmppath}up/up{str(self.number).zfill(8)}.{ filetype } " );
             try:
-                os.mkdir( f'{tmppath}us' )
+                os.mkdir( f'{tmppath}up' )
             except FileExistsError:
                 pass
         else:
@@ -329,9 +329,9 @@ class Handler:
 
             if ( not scaling ):
                 if ( self.os_type == 'win32' ):
-                    self.pathSharpening += 'us\\'
+                    self.pathSharpening += 'up\\'
                 elif ( self.os_type == 'linux' ):
-                    self.pathSharpening += 'us/'
+                    self.pathSharpening += 'up/'
 
             time.sleep( 2 );
             try:
@@ -368,7 +368,7 @@ class Handler:
                 if ( i == self.threads - 1 ):
                     for element in self.file_list:
                         self.files += element;
-                self.command_list.append( ( self.files, fsrpath, i, self.maxlength, self.os_type, sharpening ) )
+                self.command_list.append( ( self.files, fsrpath, i, self.maxlength, self.os_type, sharpening, not sharpening ) )
 
             self.pool = multiprocessing.Pool( self.threads )
             self.pool.starmap( sharpeningEngine, self.command_list );
@@ -417,8 +417,6 @@ def upscalerEngine ( files, fsrpath, quality_setting, number, maxlength, os_type
                 file_processing = files[posx:posy - pos]
                 if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'ig':
                     pos += 5
-                else:
-                    pass
                 while files[posy - pos:posy - pos + 1] != ' ':
                     pos += 1
 
@@ -460,8 +458,6 @@ def bilinearEngine ( files, fsrpath, quality_setting, number, maxlength, os_type
         file_processing = files[:maxlength - pos]
         if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'ig':
             pos += 5
-        else:
-            pass
         while files[maxlength - pos:maxlength - pos + 1] != ' ':
             pos += 1
         fileout.append(files[:maxlength - pos])
@@ -517,7 +513,7 @@ def bilinearEngine ( files, fsrpath, quality_setting, number, maxlength, os_type
 #
 #######################
 
-def sharpeningEngine ( files, fsrpath, number, maxlength, os_type, sharpening ):
+def sharpeningEngine ( files, fsrpath, number, maxlength, os_type, sharpening, didUpscale ):
     files = files;
     # Refactoring of commands that are longer than 32K characters
     fileout = [];
@@ -526,10 +522,12 @@ def sharpeningEngine ( files, fsrpath, number, maxlength, os_type, sharpening ):
         while files[maxlength - pos:maxlength - pos + 1] != ' ':
             pos += 1
         file_processing = files[:maxlength - pos]
-        if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'ig':
-            pos += 5
+        if ( didUpscale ):
+            if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'up':
+                pos += 5
         else:
-            pass
+            if file_processing[len(file_processing) - 17:len(file_processing) - 15] == 'ru':
+                pos += 8
         while files[maxlength - pos:maxlength - pos + 1] != ' ':
             pos += 1
         fileout.append(files[:maxlength - pos])
@@ -546,10 +544,12 @@ def sharpeningEngine ( files, fsrpath, number, maxlength, os_type, sharpening ):
                 while files[posy - pos:posy - pos + 1] != ' ':
                     pos += 1
                 file_processing = files[posx:posy - pos]
-                if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'ig':
-                    pos += 5
+                if ( didUpscale ):
+                    if file_processing[len(file_processing) - 14:len(file_processing) - 12] == 'up':
+                        pos += 5
                 else:
-                    pass
+                    if file_processing[len(file_processing) - 17:len(file_processing) - 15] == 'ru':
+                        pos += 8
                 while files[posy - pos:posy - pos + 1] != ' ':
                     pos += 1