Skip to content

Commit

Permalink
Merge pull request #819 from rix1337/dev
Browse files Browse the repository at this point in the history 
Improve SJ link handling
  • Loading branch information
@rix1337
rix1337 authored Jan 7, 2025
2 parents 77f508f + 60297ce commit e1bc2f2
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Chat mit der Community / Platz für Umsetzungsideen
url: https://discord.gg/enn4AG3VnM
url: https://discord.gg/eM4zA2wWQb
about: Gedacht für den allgemeinen Erfahrungsaustausch. Der falsche Ort für Fehlermeldungen.
Binary file added FeedCrawler.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# FeedCrawler

<img src="https://raw.githubusercontent.com/rix1337/FeedCrawler/main/feedcrawler/web_interface/vuejs_frontend/public/favicon.ico" data-canonical-src="https://raw.githubusercontent.com/rix1337/FeedCrawler/main/feedcrawler/web_interface/vuejs_frontend/public/favicon.ico" width="64" height="64" />
<img src="https://raw.githubusercontent.com/rix1337/FeedCrawler/main/FeedCrawler.png" data-canonical-src="https://raw.githubusercontent.com/rix1337/FeedCrawler/main/FeedCrawler.png" width="64" height="64" />

FeedCrawler automatisiert bequem das Hinzufügen von Links für den JDownloader.

Expand All @@ -22,7 +22,7 @@ FeedCrawler automatisiert bequem das Hinzufügen von Links für den JDownloader.
[![Lines of code](https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/rix1337/FeedCrawler/badge?filter=.py$,.vue$,js$,scss$,yml$&style=flat&logoColor=white&label=Lines%20of%20Code)](https://github.com/rix1337/FeedCrawler/pulse)

[![GitHub Sponsorship](https://img.shields.io/badge/support-me-red.svg)](https://github.com/users/rix1337/sponsorship)
[![Discord](https://img.shields.io/discord/1075348594225315891)](https://discord.gg/enn4AG3VnM)
[![Discord](https://img.shields.io/discord/1075348594225315891)](https://discord.gg/eM4zA2wWQb)
[![GitHub issues](https://img.shields.io/github/issues/rix1337/FeedCrawler.svg)](https://github.com/rix1337/FeedCrawler/issues)

***
Expand Down
8 changes: 4 additions & 4 deletions feedcrawler/external_sites/feed_search/sites/content_shows_sj.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ def sj_releases_to_feedparser_dict(releases, list_type, base_url, check_seasons_
continue
except:
continue
title = release['name']
series_url = base_url + '/serie/' + release["_media"]['slug']
title = release['name'].rstrip('.')
series_url = f"{base_url}/serie/{release['_media']['slug']}/{title}"
published = release['createdAt']

entries.append(FakeFeedParserDict({
"title": title,
"series_url": series_url,
"published": published,
"source": series_url + "#" + title,
"source": series_url,
"size": "",
"imdb_id": ""
}))
Expand Down Expand Up @@ -129,7 +129,7 @@ def sj_parse_download(self, series_url, title, language_id):
for season in seasons:
season = seasons[season]
for item in season['items']:
if item['name'] == title:
if title in item['name']:
valid = False
for hoster in item['hoster']:
if hoster:
Expand Down
1 change: 1 addition & 0 deletions feedcrawler/external_sites/web_search/content_shows.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ def download(payload):

notify_array = []
for title in matches:
title = title.rstrip('.')
size = ""
incomplete = False

Expand Down
4 changes: 2 additions & 2 deletions feedcrawler/providers/notifications.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def discord(items, webhook_id, webhook_token):

data = {
'username': 'FeedCrawler',
'avatar_url': 'https://imgur.com/tEi4qtb.png',
'avatar_url': 'https://raw.githubusercontent.com/rix1337/FeedCrawler/main/FeedCrawler.png',
'embeds': [{
'title': notification_dict["release"],
'description': notification_dict["event"]
Expand All @@ -101,7 +101,7 @@ def discord(items, webhook_id, webhook_token):
if poster_link:
data = {
'username': 'FeedCrawler',
'avatar_url': 'https://imgur.com/tEi4qtb.png',
'avatar_url': 'https://raw.githubusercontent.com/rix1337/FeedCrawler/main/FeedCrawler.png',
'embeds': [{
'title': notification_dict["release"],
'description': notification_dict["event"],
Expand Down
2 changes: 1 addition & 1 deletion feedcrawler/providers/version.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def get_version():
return "21.0.4"
return "21.0.5"


def create_version_file():
Expand Down
4 changes: 2 additions & 2 deletions feedcrawler/web_interface/vuejs_frontend/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion feedcrawler/web_interface/vuejs_frontend/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "feedcrawler-web",
"version": "21.0.4",
"version": "21.0.5",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 0 additions & 2 deletions feedcrawler/web_interface/vuejs_frontend/src/components/Head.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ function showSiteStatusHelp() {
toggle: true
})
}
import Captcha from './Captcha.vue'
</script>


Expand Down
32 changes: 25 additions & 7 deletions feedcrawler/web_interface/vuejs_frontend/src/components/MyJD.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ function openCaptcha(index) {
<strong>{{ x[1].name }}</strong>
</div>
<ul class="list-group list-group-flush">
<li v-if="x[1].url" class="list-group-item">
<li v-if="x[1].url && x[1].url.includes('filecrypt.')" class="list-group-item">
<button class="btn btn-outline-primary mb-2"
type="button"
@click='openCaptcha(index)'><i class="bi bi-puzzle"></i> CAPTCHA
Expand All @@ -645,12 +645,30 @@ function openCaptcha(index) {
:password="x[1].password"
/>
</div>
<span v-if="!store.misc.helper_active"><br>
<div class="">Genervt davon, CAPTCHAs manuell zu lösen? Jetzt <a
v-tippy="'Bitte unterstütze die Weiterentwicklung über eine aktive GitHub Sponsorship!'"
href="https://github.com/users/rix1337/sponsorship"
target="_blank">Sponsor werden</a> und den <a
href="#" @click="showSponsorsHelp()">den SponsorsHelper</a> für dich arbeiten lassen.</div>
<span v-if="!store.misc.helper_active" class="mt-2"><br>
Genervt davon, CAPTCHAs manuell zu lösen?<br>
Jetzt <a
v-tippy="'Bitte unterstütze die Weiterentwicklung über eine aktive GitHub Sponsorship!'"
href="https://github.com/users/rix1337/sponsorship"
target="_blank">Sponsor werden</a> und den <a
href="#" @click="showSponsorsHelp()">den SponsorsHelper</a> für dich arbeiten lassen!
</span>
</li>
<li v-else class="list-group-item">
<a class="btn btn-outline-primary mb-2"
type="button"
target="_blank"
:href="x[1].url"
><i class="bi bi-download"></i> Manuell herunterladen
</a>
<span v-if="!store.misc.helper_active" class="mt-2"><br>
Genervt davon, CAPTCHAs manuell zu lösen?<br>
Jetzt <a
v-tippy="'Bitte unterstütze die Weiterentwicklung über eine aktive GitHub Sponsorship!'"
href="https://github.com/users/rix1337/sponsorship"
target="_blank">Sponsor werden</a> und den <a
href="#" @click="showSponsorsHelp()">den SponsorsHelper</a> für dich arbeiten lassen!<br>
Nur <a href="#" @click="showSponsorsHelp()">der SponsorsHelper</a> übergibt diese Links fehlerfrei an JDownloader.
</span>
</li>
<li class="list-group-item">
Expand Down

0 comments on commit e1bc2f2

Please sign in to comment.