merge

datawhores · Nov 15, 2023 · 755d5f1 · 755d5f1
2 parents 963a64f + 57cb492
commit 755d5f1
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 44 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -30,7 +30,7 @@ Hint: Please make sure that the log formatting is readable, use a paste site
 like https://paste.passtheheadphones.me/
 
 Hint2 : add " --log debug" this will create a log file with debug messages
-Hint3 : add " --output debug" this will show debug messages in the terminal output, a log file is preferred. If your doing this make your presentation readable
+Hint3 : add " --output debug" this will show debug messages in the terminal output, a log file is preferred. If your're doing this make your presentation readable
 
 
 

diff --git a/.github/workflows/release_bundler.yml b/.github/workflows/release_bundler.yml
@@ -57,8 +57,8 @@ jobs:
 #       - name: list files 4
 #         run: ls /home/runner/work/OF-Scraper/OF-Scraper/ofscraper         
 
-  linux:
-    needs: [create_version]
+linux:
+    needs: [create_version]    
     runs-on: ubuntu-20.04
     name: create linux release
     steps:
@@ -70,10 +70,7 @@ jobs:
       - name: list files
         run:   ls -d $PWD/*    
       - name: list files2
-        run:   ls -d $PWD/ofscraper/*       
-      - name: update line
-        run: 
-          sed -i -e s/'>=3.7.0,<4'/'>=3.7.0,<3.13'/ pyproject.toml      
+        run:   ls -d $PWD/ofscraper/*      
       - name: commit
         uses: pr-mpt/actions-commit-hash@v2
         id: commit            
@@ -82,8 +79,7 @@ jobs:
         with:
           name: ofscraper_version 
           path: ofscraper      
-
-
+
       - name: create one file
         uses: addnab/docker-run-action@v3
         with:
@@ -103,7 +99,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_linux
-          path: "dist/ofscraper_linux_${{inputs.version}}"
+          path: "dist/ofscraper_linux_${{ inputs.files}}"
       - name: create zip
         uses: addnab/docker-run-action@v3
         with:
@@ -123,9 +119,9 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_linux_zip
-          path: "dist/ofscraper_linux_${{inputs.version}}.zip"              
-                      
-  windows:
+          path: "dist/ofscraper_linux_${{ inputs.files}}.zip"              
+
+windows:
     needs: [create_version]
     runs-on: windows-latest
     name: create windows release
@@ -139,14 +135,14 @@ jobs:
         run:   ls .
       - name: list files2
         run:   ls ofscraper  
+      - name: commit
+        uses: pr-mpt/actions-commit-hash@v2
+        id: commit   
       - name: replace version.py
         uses: actions/download-artifact@v3
         with:
           name: ofscraper_version 
           path: ofscraper
-      - name: update line
-        run: 
-          sed -i -e s/'>=3.7.0,<4'/'>=3.7.0,<3.13'/ pyproject.toml     
       - name: Set up Python 3.11.5
         uses: actions/setup-python@v4
         with:
@@ -161,39 +157,47 @@ jobs:
         run: poetry env use  .venv/Scripts/python3        
       - name: Install package
         run: poetry install
-      - name: install builder
+      - name: Install builder       
         run: poetry add pyinstaller==5.13.0
-      - name: create-one-file   
+      # - name: temp deactive
+      #   run: deactive
+      - name: create-one-file
         id: create-one-file
-        run: poetry run pyinstaller D:\a\OF-Scraper\OF-Scraper\ofscraper\__main__.py --collect-submodules ofscraper --onefile --name "ofscraper_windows_${{inputs.version}}"
+        run: poetry run pyinstaller D:\a\OF-Scraper\OF-Scraper\ofscraper\__main__.py --collect-submodules ofscraper --onefile --name "ofscraper_windows_${{ inputs.files}}"
         continue-on-error: true
+      - name: active env for createfile2
+        run: poetry env use  .venv/Scripts/python3     
       - name: create-one-file2
         id: create-one-file2
         if: steps.create-one-file.outcome != 'success'
-        run: poetry run pyinstaller .venv/Scripts/ofscraper --collect-submodules application --onefile --name "ofscraper_windows_${{inputs.version}}" 
+        run: poetry run pyinstaller .venv/Scripts/ofscraper --collect-submodules application --onefile --name "ofscraper_windows_${{ inputs.files}}"
       - name: upload file
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_windows
-          path: 'dist\ofscraper_windows_${{inputs.version}}.exe'
+          path: 'dist\ofscraper_windows_${{ inputs.files}}.exe'
+      # - name: temp deactive
+      #   run: deactive
       - name: create-dir
         id: create-dir
-        run: poetry run pyinstaller D:\a\OF-Scraper\OF-Scraper\ofscraper\__main__.py --collect-submodules ofscraper --name "ofscraper_windows_${{inputs.version}}" 
+        run: poetry run pyinstaller D:\a\OF-Scraper\OF-Scraper\ofscraper\__main__.py --collect-submodules ofscraper --name "ofscraper_windows_${{inputs.files}}" 
         continue-on-error: true
+      - name: active env for create-dir2
+        run: poetry env use  .venv/Scripts/python3     
       - name: create-dir2
-        id: create-dir2
+        id: create-one-dir2
         if: steps.create-dir.outcome != 'success'
-        run: poetry run pyinstaller .venv/Scripts/ofscraper --collect-submodules application --name "ofscraper_windows_${{inputs.version}}"      
+        run: poetry run pyinstaller .venv/Scripts/ofscraper --collect-submodules application --name "ofscraper_windows_${{inputs.files}}"
       - uses: vimtor/action-zip@v1
         with:
-          files: "dist/ofscraper_windows_${{inputs.version}}"
-          dest: "dist/ofscraper_windows_${{inputs.version}}.zip"
+          files: "dist/ofscraper_windows_${{inputs.files}}"
+          dest: "dist/ofscraper_windows_${{inputs.files}}.zip"
       - name: upload file
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_windows_zip
-          path: "dist/ofscraper_windows_${{inputs.version}}.zip"          
-  mac:
+          path: "dist/ofscraper_windows_${{inputs.files}}.zip"               
+mac:
     needs: [create_version]
     runs-on: macos-latest 
     name: create mac release
@@ -206,15 +210,15 @@ jobs:
       - name: list files
         run:   ls -d $PWD/*    
       - name: list files2
-        run:   ls -d $PWD/ofscraper/*    
+        run:   ls -d $PWD/ofscraper/*  
+      - name: commit
+        uses: pr-mpt/actions-commit-hash@v2
+        id: commit            
       - name: replace version.py
         uses: actions/download-artifact@v3
         with:
           name: ofscraper_version     
           path: ofscraper
-      # - name: update line
-      #   run: 
-      #     sed -i -e s/'>=3.7.0,<4'/'>=3.7.0,<3.13'/ pyproject.toml      
       - name: Set up Python 3.11.5
         uses: actions/setup-python@v4
         with:
@@ -227,38 +231,38 @@ jobs:
           poetry-version: 1.4.1
       - name: Install package
         run: poetry install
-      - name: install builder
-        run: poetry add pyinstaller==5.13.0        
+      - name: Install builder
+        run: pip install pyinstaller==5.13.0
       - name: create-one-file
         id: create-one-file
-        run: poetry run pyinstaller /Users/runner/work/OF-Scraper/OF-Scraper/ofscraper/__main__.py --collect-submodules application --onefile --name "ofscraper_macos_${{inputs.version}}"
+        run: poetry run pyinstaller /Users/runner/work/OF-Scraper/OF-Scraper/ofscraper/__main__.py --collect-submodules ofscraper --onefile --name "ofscraper_macos_${{ inputs.files}}"
         continue-on-error: true
       - name: create-one-file2
         id: create-one-file2
         if: steps.create-one-file.outcome != 'success'
-        run: poetry run pyinstaller .venv/bin/ofscraper --collect-submodules application --onefile --name "ofscraper_macos_${{inputs.version}}" 
-      - name: upload file
+        run: poetry run pyinstaller .venv/bin/ofscraper --collect-submodules application --onefile --name "ofscraper_macos_${{ inputs.files}}"      
+      - name: upload fille
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_macos
-          path: "dist/ofscraper_macos_${{inputs.version}}"
+          path: "dist/ofscraper_macos_${{ inputs.files}}"
       - name: create-dir
         id: create-dir
-        run: poetry run pyinstaller /Users/runner/work/OF-Scraper/OF-Scraper/ofscraper/__main__.py --collect-submodules application --name "ofscraper_macos_${{inputs.version}}" 
+        run: poetry run pyinstaller /Users/runner/work/OF-Scraper/OF-Scraper/ofscraper/__main__.py --collect-submodules ofscraper --name "ofscraper_macos_${{ inputs.files}}" 
         continue-on-error: true
       - name: create-dir2
         id: create-dir2
         if: steps.create-dir.outcome != 'success'
-        run: poetry run pyinstaller .venv/bin/ofscraper --collect-submodules application --name "ofscraper_macos_${{inputs.version}}" 
+        run: poetry run pyinstaller .venv/bin/ofscraper --collect-submodules application --name "ofscraper_macos_${{ inputs.files}}"        
       - uses: vimtor/action-zip@v1
         with:
-          files: "dist/ofscraper_macos_${{inputs.version}}"
-          dest: "dist/ofscraper_macos_${{inputs.version}}.zip"
+          files: "dist/ofscraper_macos_${{ inputs.files}}"
+          dest: "dist/ofscraper_macos_${{ inputs.files}}.zip"
       - name: upload file
         uses: actions/upload-artifact@v3
         with:
           name: ofscraper_macos_zip
-          path: "dist/ofscraper_macos_${{inputs.version}}.zip"               
+          path: "dist/ofscraper_macos_${{inputs.files}}.zip"    
 
   publish_release:
     runs-on: ubuntu-latest

diff --git a/ofscraper/prompts/prompts.py b/ofscraper/prompts/prompts.py
@@ -92,7 +92,7 @@ def scrape_paid_prompt():
         {
             'type': 'list',
             "name":name,
-            'message': "Scrape entire paid page\n\n[Warning: initial Scan can be slow]\n[Caution: You should not need this unless your looking to scrape paid content from a deleted/banned model]",
+            'message': "Scrape entire paid page\n\n[Warning: initial Scan can be slow]\n[Caution: You should not need this unless your're looking to scrape paid content from a deleted/banned model]",
             'choices':[Choice(True,"True"),Choice(False,"False",enabled=True)],
             'long_instruction': prompt_strings.SCRAPE_PAID,
             "default":False