affvps · affvps · Nov 3, 2022 · Apr 9, 2016 · Sep 24, 2016 · Sep 24, 2016
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -6,8 +6,16 @@
 
 
 
-### What version of the product are you using? On what operating system? ###
+### What version of the product are you using. (Please use the latest version of bittorrent-tracker-editor and your torrent client) ###
+
+
+
+###  On what operating system? ###
 
 
 
 ### Please provide any additional information below. ###
+
+
+
+### Add a modified sintel torrent files example to reproduce the issue. [Download from Github: sintel](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/tree/master/test_torrent) ###
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
 # ignore possible temporary file added in the root 
 /*.txt
 
+# ignore bakup files
+*.bak
+
 # folders generated by compiler. Should always be ignored.
 /lib
 
 #items in these folder should be added explicit
 /enduser
-/source
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "travis-lazarus"]
 	path = travis-lazarus
-	url = https://github.com/nielsAD/travis-lazarus.git
+	url = https://github.com/GerryFerdinandus/travis-lazarus.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,47 +1,87 @@
 # Part of `travis-lazarus` (https://github.com/nielsAD/travis-lazarus)
 # License: MIT
 
-sudo: true
+language: shell
 
-os:
-  - linux
-  - osx
+# Linux compability issue.
+# Need to build in xenial with lazarus 1.8.2.
+# Do not use bionic or newer Lazarus version
 
-env:
-  global:
-    - LPIEDITORPATH=source/project/tracker_editor
-    - WINEPREFIX=~/.winelaz
-    - DISPLAY=:99.0
-  matrix:	#For linux and mac osx build
-    - LAZ_VER=1.4.4
+# For linux headless.
+# See travis_unit_test.sh will install and use xvfb-run
+#services: (- xvfb) does not work must use xvfb-run
 
-matrix:		#For windows build with linux wine. Use the same lazarus version as linux/mac build.
+jobs:
   include:
-    - os: linux
-      env: LAZ_VER=1.4.4  LAZ_ENV=wine WINEARCH=win32 LAZ_OPT="--os=win32 --cpu=i386"
+    - name: Ubuntu 16.04 AMD64 (1.8.2)
+      os: linux
+      dist: xenial
+      env: LAZ_VER=1.8.2 RELEASE_ZIP_FILE="trackereditor_linux_amd64.zip"
+    - name: Ubuntu 16.04 AArch64 (1.6)
+      os: linux
+      dist: xenial
+      arch: arm64
+      env: LAZ_PKG=true RELEASE_ZIP_FILE="trackereditor_linux_AArch64.zip"
+    - name: macOS 10.14 (PKG)
+      os: osx
+      osx_image: xcode11.3
+      env: LAZ_PKG=true LAZ_OPT="--widgetset=cocoa" RELEASE_ZIP_FILE="trackereditor_macOS.zip"
+    - name: Windows (PKG) Build 32-bit software
+      os: windows
+      env: LAZ_PKG=true LAZ_REL=32 RELEASE_ZIP_FILE="trackereditor_win32.zip"
 
 before_install:
-    # Start virtual display server
-  - sh -e /etc/init.d/xvfb start || true
+# Install python in windows OS
+- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install python3 --params "/InstallDir:C:\python3"; fi
+- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export PATH=/c/Python3:/c/Python3/Scripts:/c/lazarus:$PATH; fi
 
 install:
-    # Install prerequisites (fpc/lazarus/wine/qemu)
-  - ./travis-lazarus/.travis.install.py
+# Output something at regular time or Travis will kills the job
+- while sleep 60; do echo "===== 1 minute mark ====="; done &
+- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then python ./travis-lazarus/.travis.install.py; fi
+- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then ./travis-lazarus/.travis.install.py; fi
+# Killing background sleep loop
+- kill %1
 
 script:
-  - lazbuild $LAZ_OPT $LPIEDITORPATH/trackereditor.lpi      # Build trackereditor project
+# Output something at regular time or Travis will kill the job
+  - echo "start script"
+  - while sleep 60; do echo "===== 1 minute mark ====="; done &
+
+# Build trackereditor project (Release mode)
+  - lazbuild --build-mode=Release $LAZ_OPT $PROJECT_LPI_EDITOR_PATH
+
+# Build unit test project (Debug mode)
+  - lazbuild --build-mode=Debug $LAZ_OPT $PROJECT_LPI_UNIT_TEST_PATH
+
+# Start the unit test
+  - source ./scripts/travis_unit_test.sh
+
+# Killing background sleep loop
+  - kill %1
 
 before_deploy:
+# Create the zip file for deployment
   - source ./scripts/travis_deploy.sh
 
 deploy:
-  provider: releases
-  prerelease: false
-  skip_cleanup: true
-  api_key:
-    secure: "s2OquTSTFNECWme15GLuLHGykXQK9Q/ie38eI8wwzPZUQ3WCFJxYRGrR6XSaFWe/VfjNlDTfPaUsKfo4Fi9atOec1fp7ewA9JNnFUclw38o9UHirDYgzDNQD8BMhXXMaaxvYJBT+aN3CFvaBkkTyIb8jYO6RsvHfBQmOb6B//Fl2IFAgI/j8+qUKVtZWYEezGUCMCKZ+r/sFgfK91DsKtH7T51WVrJ9oI/HvvGISw6K1sG0X56LZry/shy8f3NPvGfFofooZ/9uPUamDmZwNR7YR91P10cykihZnarPDbCaCAD77D+AeFSDpcRyusr07dRfqIqNFQ1Hcu3GMIZL2W1dfGdZ9z0PJWQcMZQtwmjimV+2cEgIQTCvmG1wzbOTOW4T9QnDFB72M5njcxd1RYlVJwXq3SgSN1smQzRfArUd1bFeD0crGQ4urhfU12CJ50isgXXgXrOT7RclWUR2i1QISFS2ISDtGuCyh1vSGjVPQ9RSYSgG7/OufwdUXA/ZyK2mFpbZ0iKGNEYtZaL8/ZQMM9KlkyWPoQaSve/zTs+D3N5rFcOfQ7EHAAPTzz/fjpU7Yd3a0yf4pLSpr+ConVw1Kwc7d3VYSsoxhnLp2fgij+Xs/skRud8PLiOUsk8L3hUMS4p9X4ANkE181aQTAmzv7qc6qtXOSkhpzsIIxWGY="
-  file: "${RELEASE_ZIP_FILE}"
-  on:
-    tags: true 
-    repo: GerryFerdinandus/bittorrent-tracker-editor
-
+  - provider: releases
+    prerelease: false
+    cleanup: false
+    edge: true # opt in to dpl v2
+    token:
+      secure: hmjev+YIClSOec6wMclUv5W4lgyLpdX7DlUpF2LQ1W/EO/x/b8RzmSPjNZ5sa7IDUe1WoVXm89G6HtkGGHcRqJrZjNn18HvpvEOnIYgIEXBVtW9uaURsSJ2LYve9beHHvYzs0doEQp1I24qTENUOqMABStk7MKRTATZ7nBWIinZVkpojEYIizQtCnUWwJXpzgs9mx7BEAVqLJPJ35oXNVjEgE96gsWMaYuX82BsVpL9VjGIaYpbEc1iBFBr2RHTgHG03H+2wBewJ4gh3hFwq9vt6mEqdC6Y9UIqmAEUMzCpokqrIfV2cfnPe24miPqmCLboua7Ddu8OpLj/yQ9DvC8xVEVh8aiGszzPvnytaFuRfLxI5HdAtUkA/9P3dXwjJKLJs568kyCTz4Tk7Icrb7seS1i84BJs3Vp2/lkmqDRDR0OqVGTczZGsxfTK+iaZJaNXb999BmGBw+xnPuG1lgrjHUYyEH2ha9D/9eOXiQfxdKUktPs1cF0II7uv5Cg3LEcFyN/A7jblNpM5B9cnf5kJ13lbpqL+Eyig90b9Q9YsrwGGOqtXJG+jSqXOv0O9/warFJfadA0avJljOFv4Pxl4tYe73EA/gP1GVG5UVC/F9nWZhUzP1kPCjzTzHoYBDCmHf8/GErdpCtibqRHoMIelrbcpe0jr+j5aNPxnTKAc=
+    file: "${RELEASE_ZIP_FILE}"
+    on:
+      tags: true
+      repo: GerryFerdinandus/bittorrent-tracker-editor
+  - provider: s3
+    access_key_id: $AWS_ACCESS_KEY
+    secret_access_key: $AWS_SECRET_KEY
+    bucket: "bittorrent-tracker-editor"
+    cleanup: false
+    region: eu-central-1
+    local_dir: s3
+    edge: true # opt in to dpl v2
+    on:
+      branch: to_be_deleted_unit_test
diff --git a/README.md b/README.md
@@ -1,78 +1,125 @@
 **bittorrent-tracker-editor** will add/remove bittorrent tracker from the torrent file(s).
-This software works on Windows XP SP3, Windows 7+, Mac OS X and Linux.
+This software works on Windows XP SP3, Windows 7+, macOS and Linux.
 
 ---
 
-## Code Status: ##
-[![Build Status](https://travis-ci.org/GerryFerdinandus/bittorrent-tracker-editor.svg?branch=master)](https://travis-ci.org/GerryFerdinandus/bittorrent-tracker-editor)
-for Windows, Mac OS X and Linux build.
+## Software latest release: ##
+[![GitHub Latest release](https://img.shields.io/github/release/GerryFerdinandus/bittorrent-tracker-editor/all.svg)](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/releases)
+
+---
 
+## Code Status: ##
+Continuous integration|Status| Build operating system
+------------|---------|---------
+Travis-CI   |[![Build Status](https://travis-ci.com/GerryFerdinandus/bittorrent-tracker-editor.svg?branch=master)](https://travis-ci.com/GerryFerdinandus/bittorrent-tracker-editor)        |Linux, macOS and Windows
+Snapcraft-CI   |[![Snap Status](https://build.snapcraft.io/badge/GerryFerdinandus/bittorrent-tracker-editor.svg)](https://build.snapcraft.io/user/GerryFerdinandus/bittorrent-tracker-editor)|Linux
 ---
 
 ## Warning: ##
-There is no backup function in this software. Used it at your own risk. Bittorrent work fine without this program. You probably don't need this software.
+There is no backup function in this software. Use it at your own risk. Bittorrent works fine without this program. You probably don't need this software.
 
 ---
 
 ## Which program to use for add/remove bittorrent trackers? ##
   * **Edit one torrent file:** You can use http://torrenteditor.com/
-  * **Edit multiple torrent file:** Use this program. It is made for changing multiple torrent files.
+  * **Edit multiple torrent files:** Use this program. It is made for changing multiple torrent files.
 
 ---
 
 ## Features: ##
   * Select one torrent file or a folder with torrent files.
-  * Add one or more tracker at the same time.
-  * Remove one or more tracker at the same time.
-  * Remove all the tracker to create tracker less torrent. DHT torrent
+  * Add one or more trackers at the same time.
+  * Remove one or more trackers at the same time.
+  * Remove all the trackers to create trackerless torrent. DHT torrent
   * Change public/private flag. Warning: This will change the torrent info HASH.
-  * Preset add/remove tracker via add\_trackers.txt and remove\_trackers.txt files when present in the same folder as the executable file.
+  * Preset add/remove tracker via add\_trackers.txt and remove\_trackers.txt files when present in the same folder as the executable file. (For linux snap version use: home/snap/bittorrent-tracker-editor/common/ )
   * Optional start as console program. (See readme.txt inside download)
   * Show torrent files content.
+  * Download stable trackers from newTrackon or ngosang.
 
 ---
 
 ## Downloads: ##
-  * [From GitHub: Executable file for Windows, Mac OS X and Linux.](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/releases)
+  * [From GitHub: Executable file for Windows, macOS and Linux.](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/releases)
+  * [From GitHub: Trackers list (from GitHub user: ngosang )](https://github.com/ngosang/trackerslist)
+  * [From newtrackon.com: Trackers list (from GitHub user: CorralPeltzer )](https://newtrackon.com)
 
 ---
 
-## Software version ##
+## Software history: ##
+
+### 1.33.0.beta.6 ###
+  * ADD: Direct download support for ngosang via menu.
+  * ADD: Extra tabpage 'private torrent'. For issue 31 and 34
+  * ADD: Check box 'Skip Announce Check in the URL' ([Issue 31](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/31))
+  * ADD: Command parameter '-SAC' -> 'Skip Announce Check' in the URL ([Issue 31](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/31))
+  * ADD: Support 'Info Source' tag for private trackers ([Issue 34](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/34))
+  * ADD: Command parameter '-SOURCE' -> info Source tag for private trackers. See readme.txt file ([Issue 34](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/34))
+
+### 1.33.0.beta.5 ###
+  * FiX: support for '/announce.php'([Issue 27](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/27))
+
+### 1.33.0.beta.4 ###
+  * FIX: There was an issue with uploading tracker list to newTrackon.
+
+### 1.33.0.beta.3 ###
+  * FIX: WebTorrent do not have '/announce'  ([Issue 24](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/24))
+
+### 1.33.0.beta.2 ###
+  * ADD: Wrong tracker URL format from torrent files should be unselected by default ([Issue 22](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/22))
+  * ADD: Upload trackers to newTrackon ([Issue 23](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/23))
+
+### 1.33.0.beta.1 ###
+  * ADD:  Verify the working status of public trackers. (Data from newTrackon) ([Issue 21](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/21))
+
+### 1.32.0 ###
+  * ADD:  Add more options for updating the torrent tracker list. ([Issue 8](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/8))
+  * ADD:  Add trackers but keep the original unique trackers list intact. ([Issue 12](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/12))
+  * ADD:  Randomize tracker order for each torrent file. ([Issue 19](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/19))
+  * FIX:  Trackers with https ([Issue 9](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/9))
+  * FIX:  Read torrent file with string size larger that 1MB ([Issue 10](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/10))
+  * FIX:  Give user a warning when torrent file is read only file. ([Issue 14](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/14))
+  * FIX:  Give user a warning when torrent file update failed. ([Issue 15](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/15))
+  * FIX:  Can not be opened by dragging a file. ([Issue 17](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/17))
+  * FIX:  Need sanitize URL tracker. ([Issue 18](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/18))
+  * FIX:  WebSocket ws:// and wss:// should be accepted as input. ([Issue 20](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/20))
+
 ### 1.31 ###
-  * Add: Edit comment in data/info grid column.
-  * FIX:  ([Issue 6](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/6))
+  * ADD: Edit comment in data/info grid column.
+  * FIX: The data/info column can be moved but it is not updated correctly when torrent is reloaded. ([Issue 6](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/6))
 
 ### 1.30 ###
-  * Add: Tab page Files/trackers/info
-  * Add: Optional start as console program. (See readme.txt inside download)
-  * Add: remove\_trackers.txt will remove specific trackers form torrent.
-  * Add: export\_trackers.txt is created after updating the torrent.
-  * Add: drag and drop of trackers file (with '.txt' file extension)
-  * FIX:  ([Issue 4](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/4)) + ([Issue 5](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/5))
+  * ADD: Tab page Files/trackers/info
+  * ADD: Optional start as console program. (See readme.txt inside download)
+  * ADD: remove\_trackers.txt will remove specific trackers from torrent.
+  * ADD: export\_trackers.txt is created after updating the torrent.
+  * ADD: drag and drop of trackers file (with '.txt' file extension)
+  * FIX: Can not remove duplicate Tracker automatically ([Issue 4](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/4))
+  * FIX: Can't open some of .torrent files. ([Issue 5](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/5))
 
 ### 1.21 ###
   * FIX: Support for Unicode in filename. (Chinese etc.)
 
 ### 1.20 ###
-  * Add: Tab page torrent info/data.
-  * Add: Drag & Drop torrent files or a folder with torrent files inside.
+  * ADD: Tab page torrent info/data.
+  * ADD: Drag & Drop torrent files or a folder with torrent files inside.
 
 ### 1.10 ###
-  * Add: Tab page for public/private flag. ([Issue 1](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/1))
-  * Add: Load tracker list from file via menu or at start-up, when file add\_trackers.txt is present in the same folder as the executable file.
+  * ADD: Tab page for public/private flag. ([Issue 1](https://github.com/GerryFerdinandus/bittorrent-tracker-editor/issues/1))
+  * ADD: Load tracker list from file via menu or at start-up, when file add\_trackers.txt is present in the same folder as the executable file.
 
 ### 1.00 ###
   * First release
 
 ---
 
-![https://8d7d8faefd7e24e8562f235c97f55f248c7636d1.googledrive.com/host/0B4lG_fvmX5NZRkMtcjgzT2k5QTg/trackereditor.png](https://8d7d8faefd7e24e8562f235c97f55f248c7636d1.googledrive.com/host/0B4lG_fvmX5NZRkMtcjgzT2k5QTg/trackereditor.png)
+![](pictures/trackereditor.png?raw=true "Trackers List")
 
-This screen shot show the program, after a folder is selected with 97 torrent files inside. The normal procedure is to deselect the trackers that no longer working. Optionally add your one trackers. And press the 'Update torrent'
+This screen shot show the program, after a folder is selected with torrent files inside. The normal procedure is to deselect the trackers that are no longer working. Optionally add your own trackers. And select the 'Update torrent' menu.
 
 ---
 
-![https://8d7d8faefd7e24e8562f235c97f55f248c7636d1.googledrive.com/host/0B4lG_fvmX5NZRkMtcjgzT2k5QTg/filestrackersinfo.png](https://8d7d8faefd7e24e8562f235c97f55f248c7636d1.googledrive.com/host/0B4lG_fvmX5NZRkMtcjgzT2k5QTg/filestrackersinfo.png)
+![](pictures/filestrackersinfo.png?raw=true "Files/Trackers/Info")
 
 ---
 
@@ -82,3 +129,7 @@ This screen shot show the program, after a folder is selected with 97 torrent fi
 ---
 
 This program is developed using [Lazarus](http://lazarus.freepascal.org/) RAD and [Free Pascal](http://www.freepascal.org/) compiler.
+
+---
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)
diff --git a/SourceCodeBuild.txt b/SourceCodeBuild.txt
@@ -14,8 +14,9 @@ Executable file is created in the 'enduser' directory.
 
 -------- Linux Ubuntu 14.04
 sudo apt-get update
-sudo apt-get install lazarus -y
-cd source/project/tracker_editor/
-lazbuild trackereditor.lpi
+sudo apt-get install git lazarus -y
+cd ~
+git clone --recursive https://github.com/GerryFerdinandus/bittorrent-tracker-editor.git
+lazbuild bittorrent-tracker-editor/source/project/tracker_editor/trackereditor.lpi
 
 Executable file is created in the 'enduser' directory.
diff --git a/enduser/add_trackers.txt b/enduser/add_trackers.txt
@@ -1,4 +1,3 @@
-udp://tracker.openbittorrent.com:80/announce
-udp://tracker.publicbt.com:80/announce
-udp://tracker.istole.it:80/announce
-udp://open.demonii.com:1337/announce
+udp://tracker.coppersurfer.tk:6969/announce
+udp://tracker.opentrackr.org:1337/announce
+wss://tracker.openwebtorrent.com
diff --git a/enduser/libeay32.dll b/enduser/libeay32.dll
diff --git a/...ser/trackereditor.app/Contents/Info.plist → ...app/trackereditor.app/Contents/Info.plist b/...ser/trackereditor.app/Contents/Info.plist → ...app/trackereditor.app/Contents/Info.plist
@@ -39,6 +39,8 @@
       </array>
     </dict>
   </array>
+  <key>CFBundleIconFile</key>
+  <string>iconfile</string>
   <key>NSHighResolutionCapable</key>
   <true/>
 </dict>

diff --git a/...trackereditor.app/Contents/MacOS/.gitkeep → ...trackereditor.app/Contents/MacOS/.gitkeep b/...trackereditor.app/Contents/MacOS/.gitkeep → ...trackereditor.app/Contents/MacOS/.gitkeep
diff --git a/enduser/trackereditor.app/Contents/PkgInfo → ...os/app/trackereditor.app/Contents/PkgInfo b/enduser/trackereditor.app/Contents/PkgInfo → ...os/app/trackereditor.app/Contents/PkgInfo
diff --git a/enduser/macos/app/trackereditor.app/Contents/Resources/iconfile.icns b/enduser/macos/app/trackereditor.app/Contents/Resources/iconfile.icns
diff --git a/enduser/macos/entitlements.plist b/enduser/macos/entitlements.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>