diff --git a/README.md b/README.md
index fdecae1fb..b22f18ab7 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* Toloka.to
* Torrent-Explosiv
* Torrents-Local
- * Torrents-Town (T-T)
* TribalMixes
* Union Fansub
* YggTorrent (YGG)
diff --git a/src/Jackett.Common/Definitions/torrent-town.yml b/src/Jackett.Common/Definitions/torrent-town.yml
deleted file mode 100644
index c8efc51ce..000000000
--- a/src/Jackett.Common/Definitions/torrent-town.yml
+++ /dev/null
@@ -1,197 +0,0 @@
----
-id: torrent-town
-name: Torrent-Town
-description: "Torrent-Town (T-T) is a German Private site for TV / MOVIES / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
- - https://torrent-town.hopto.org/
-
-caps:
- categorymappings:
- # Software
- - {id: 39, cat: PC, desc: "Appz - Linux"}
- - {id: 48, cat: PC/Mac, desc: "Appz - Mac"}
- - {id: 45, cat: PC, desc: "Appz - Other"}
- - {id: 49, cat: PC/0day, desc: "Appz - Windows"}
- # Doku
- - {id: 40, cat: TV/Documentary, desc: "Doku - HD"}
- - {id: 41, cat: TV/Documentary, desc: "Doku - SD"}
- # Game
- - {id: 83, cat: Console, desc: "Game - Konsolen"}
- - {id: 51, cat: PC/Games, desc: "Game - Mac"}
- - {id: 52, cat: PC/Games, desc: "Game - PC"}
- - {id: 98, cat: Console, desc: "Game - Wimmelbild"}
- - {id: 50, cat: PC/Games, desc: "Game - Linux"}
- # Movie
- - {id: 30, cat: Movies/HD, desc: "Movie - 1080p"}
- - {id: 64, cat: Movies/3D, desc: "Movie - 3D"}
- - {id: 28, cat: Movies/HD, desc: "Movie - 720p"}
- - {id: 63, cat: Movies/BluRay, desc: "Movie - Bluray"}
- - {id: 32, cat: Movies/DVD, desc: "Movie - DVD / HD2DVD"}
- - {id: 85, cat: Movies, desc: "Movie - Int."}
- - {id: 99, cat: Movies/HD, desc: "Movie - Packs"}
- - {id: 33, cat: Movies/SD, desc: "Movie - SD x264"}
- - {id: 36, cat: Movies/SD, desc: "Movie - SD XviD"}
- - {id: 31, cat: Movies/UHD, desc: "Movie - U-HD"}
- - {id: 86, cat: Movies/HD, desc: "Movie - x265"}
- # Musik
- - {id: 57, cat: Audio, desc: "Musik - Alben"}
- - {id: 81, cat: Audio, desc: "Musik - Charts"}
- - {id: 53, cat: Audio/Lossless, desc: "Musik - Flac"}
- - {id: 88, cat: Audio/Other, desc: "Musik - Misc"}
- - {id: 54, cat: Audio/Video, desc: "Musik - MusikVideo"}
- - {id: 100, cat: Audio/Other, desc: "Musik - Ost"}
- - {id: 84, cat: Audio, desc: "Musik - Packs"}
- - {id: 87, cat: Audio/Other, desc: "Musik - Sampler"}
- # Serien
- - {id: 67, cat: TV/HD, desc: "Serien - Folgen HD"}
- - {id: 70, cat: TV/SD, desc: "Serien - Folgen SD"}
- - {id: 68, cat: TV/HD, desc: "Serien - Pack HD"}
- - {id: 69, cat: TV/SD, desc: "Serien - Pack SD"}
- # Sport
- - {id: 76, cat: TV/Sport, desc: "Sport - HD"}
- - {id: 74, cat: TV/Sport, desc: "Sport - SD"}
- # Other
- - {id: 91, cat: Audio/Audiobook, desc: "Unsorted - A-Book"}
- - {id: 90, cat: TV/Anime, desc: "Unsorted - Anime"}
- - {id: 92, cat: Books/EBook, desc: "Unsorted - E-Book DE."}
- - {id: 93, cat: Books/EBook, desc: "Unsorted - E-Book INT."}
- - {id: 94, cat: Books/Comics, desc: "Unsorted - E-Paper"}
- - {id: 95, cat: Other, desc: "Unsorted - Kids"}
- - {id: 96, cat: PC/Mobile-Other, desc: "Unsorted - Mobile"}
- - {id: 97, cat: Other, desc: "Unsorted - Other"}
- # XXX
- - {id: 78, cat: XXX/x264, desc: "XXX - HD"}
- - {id: 89, cat: XXX/Other, desc: "XXX - Other"}
- - {id: 79, cat: XXX/Pack, desc: "XXX - Packs"}
- - {id: 77, cat: XXX/SD, desc: "XXX - SD"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep]
- movie-search: [q]
- music-search: [q]
- book-search: [q]
-
-settings:
- - name: username
- type: text
- label: Username
- - name: password
- type: password
- label: Password
- - name: freeleech
- type: checkbox
- label: Filter FreeLeech only
- default: false
- - name: onlyupload
- type: checkbox
- label: Filter OnlyUpload only
- default: false
- - name: info_free
- type: info
- label: About Freeleech and OnlyUpload at Torrent-Town
- default: FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).
- - name: sort
- type: select
- label: Sort requested from site
- default: added
- options:
- added: created
- seeds: seeders
- size: size
- name: title
- - name: type
- type: select
- label: Order requested from site
- default: desc
- options:
- desc: desc
- asc: asc
-
-login:
- path: takelogin.php
- method: post
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- error:
- - selector: .tablea:contains("Fehler")
- test:
- path: index.php
- selector: a[href="logout.php"]
-
-download:
- selectors:
- - selector: a[href^="downloads.php?torrent="]
- attribute: href
-
-search:
- paths:
- - path: browse.php
- inputs:
- $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- showsearch: 1
- search: "{{ .Keywords }}"
- # 0 active, 1 all, 2 dead
- incldead: 1
- orderby: "{{ .Config.sort }}"
- sort: "{{ .Config.type }}"
- # site does not support imdbid search from the browse.php page or return imdb links in results
-
- rows:
- selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
-
- fields:
- category:
- selector: a[href^="browse.php?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- title:
- selector: a[href^="details.php"]
- details:
- selector: a[href^="details.php"]
- attribute: href
- download:
- selector: a[href^="details.php"]
- attribute: href
- poster:
- selector: img[id="img-1"]
- attribute: src
- size:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
- files:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
- seeders:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
- leechers:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
- grabs:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
- date:
- selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
- filters:
- - name: append
- args: " +01:00" # CET
- - name: replace
- args: ["\xA0", " "]
- - name: dateparse
- args: "02.01.2006 15:04:05 -07:00"
- downloadvolumefactor:
- case:
- img[src="pic/oupic.gif"]: 0 # only upload is counted
- "*": 1
- uploadvolumefactor:
- case:
- img[src="pic/freeleech.gif"]: 0 # nothing is counted
- "*": 1
- minimumratio:
- text: 0.7
- minimumseedtime:
- # 2 days (as seconds = 2 x 24 x 60 x 60)
- text: 172800
-# engine n/a
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index b12874b0f..31001dc6c 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -557,6 +557,7 @@ namespace Jackett.Updater
"Definitions/torrentseed.yml", // renamed to latinop2p #9065
"Definitions/torrentseeds.yml", // migrated to c#
"Definitions/torrentsmd.yml",
+ "Definitions/torrent-town.yml",
"Definitions/torrentsurf.yml", // renamed xtremebytes #9951
"Definitions/torrentvault.yml",
"Definitions/torrentwal.yml",