improve linux install

Author: arch

contrib/Installer/assets/main.lua

@@ -253,7 +253,13 @@ function update(delta)
         import_funscript_generator_result()
     end
     if math.fmod(updateCounter, 1000) == 1 then
-        local f = io.open("C:/Temp/funscript_editor.log")
+        local logfile = ""
+        if platform == "Windows" then
+            logfile = "C:/Temp/funscript_editor.log"
+        else
+            logfile = "/tmp/funscript_editor.log"
+        end
+        local f = io.open(logfile)
         if f then
             logfileExist = true
             f:close()
@@ -297,12 +303,19 @@ function gui()
         end
     end
 
-    -- if logfileExist then
-    --       ofs.SameLine()
-    --       if ofs.Button("Open Log") then
-    --          processHandleLogFile = ofs.CreateProcess("notepad.exe", "C:/Temp/funscript_editor.log")
-    --       end
-    -- end
+    if logfileExist then
+        if platform == "Windows" then
+            -- ofs.SameLine()
+            -- if ofs.Button("Open Log") then
+            --     processHandleLogFile = ofs.CreateProcess("notepad.exe", "C:/Temp/funscript_editor.log")
+            -- end
+        else
+            ofs.SameLine()
+            if ofs.Button("Open Log") then
+                processHandleLogFile = ofs.CreateProcess("/usr/bin/xdg-open", "/tmp/funscript_editor.log")
+            end
+        end
+    end
 
     ofs.Separator()
     ofs.Text("Post-Processing:")

contrib/OpenFunscripter/openfunscripter_setup_linux.sh

@@ -4,50 +4,75 @@ if command -v apt; then
     sudo apt install -y cmake build-essential libmpv-dev libglvnd-dev libxext-dev make git gcc g++ cmake libmpv-dev libatlas-base-dev
 fi
 
-if [ -d ./OFS ]; then
-    echo "OpenFunscripter Source already downloaded"
-    pushd OFS
+OFS_DIR="$HOME/.local/share/OFS/application"
+
+if [ -d $OFS_DIR ]; then
+    echo ">> OpenFunscripter Source already downloaded (Updating...)"
+    pushd $OFS_DIR
     git pull
     git submodule update
 else
-    git clone https://github.com/OpenFunscripter/OFS.git
-    pushd OFS
+    mkdir -p `dirname $OFS_DIR`
+    echo ">> Clone OpenFunscripter Source"
+    git clone https://github.com/OpenFunscripter/OFS.git $OFS_DIR
+    pushd $OFS_DIR
     git submodule update --init
-    pushd lib/EASTL
+    pushd $OFS_DIR/lib/EASTL
     git submodule update --init
     popd
-    echo "OpenFunscripter Source downloaded to ./OFS"
+    echo ">> OpenFunscripter Source downloaded to $OFS_DIR"
 fi
 
-echo "build OFS"
+echo ">> Build OFS"
 rm -rf build
 mkdir -p build
 pushd build
 cmake ..
 make -j$(expr $(nproc) \+ 1)
-popd
-popd
+popd  # build
+popd  # $OFS_DIR
 
-echo "install ofs extension"
+echo ">> Install ofs extension"
 mkdir -p ~/.local/share/OFS/OFS_data/extensions/MTFG
 pushd ~/.local/share/OFS/OFS_data/extensions/MTFG
+
 if [ ! -d ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor ]; then
     git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
 fi
 
 pushd ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor
 git pull
-source ~/anaconda3/etc/profile.d/conda.sh 2>/dev/null
-source ~/miniconda3/etc/profile.d/conda.sh 2>/dev/null
-conda env create -f environment_ubuntu.yaml
+
+if command -v apt; then
+    source ~/anaconda3/etc/profile.d/conda.sh 2>/dev/null
+    source ~/miniconda3/etc/profile.d/conda.sh 2>/dev/null
+    conda env create -f environment_ubuntu.yaml
+fi
+
 if [ -f ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/assets/ffmpeg ]; then
     cp -fv ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/assets/ffmpeg ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/funscript_editor/data/ffmpeg
 else
-    # TODO newes ffmpeg break MTFG!!
+    # TODO newest ffmpeg break MTFG!!
     bash download_ffmpeg.sh
 fi
 popd
 
 cp -fv ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/contrib/Installer/assets/main.lua ~/.local/share/OFS/OFS_data/extensions/MTFG/main.lua
 
 popd
+
+if [ ! -e ~/.local/bin/OpenFunscripter ]; then
+    ln -s `realpath $OFS_DIR`/bin/OpenFunscripter ~/.local/bin/OpenFunscripter
+fi
+
+
+mkdir -p ~/.local/share/applications
+
+cat >> ~/.local/share/applications/OpenFunscripter <<'EOF'
+[Desktop Entry]
+Type=Application
+Name=OpenFunscripter
+Exec=$HOME/.local/bin/OpenFunscripter
+Comment=OpenFunscripter
+StartupWMClass=OpenFunscripter
+EOF

funscript_editor/algorithms/funscriptgenerator.py

@@ -615,15 +615,15 @@ def tracking(self) -> str:
                     (woman_tracker_status, bbox_woman[tracker_number]) = trackers_woman[tracker_number].result()
                     if woman_tracker_status != StaticVideoTracker.Status.OK:
                         status = '{}.1 '.format(tracker_number+1) + woman_tracker_status
-                        delete_last_predictions = (self.params.skip_frames+1)
+                        delete_last_predictions = (self.params.skip_frames+1)*3
                         stop_tracking = True
                         break
 
                     if self.params.track_men:
                         (men_tracker_status, bbox_men[tracker_number]) = trackers_men[tracker_number].result()
                         if men_tracker_status != StaticVideoTracker.Status.OK:
                             status = '{}.2 '.format(tracker_number+1) + men_tracker_status
-                            delete_last_predictions = (self.params.skip_frames+1)
+                            delete_last_predictions = (self.params.skip_frames+1)*3
                             stop_tracking = True
                             break