Refine URL handling and improve string processing for SJ

Updated URL handling to include specific conditions and better string formatting across components and external site logic. Improved title processing by stripping trailing characters to ensure consistency and reliability. Removed unused imports in Head.vue for cleaner code.
rix1337 · Jan 7, 2025 · 60297ce · 60297ce
1 parent 51665cb
commit 60297ce
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/feedcrawler/external_sites/feed_search/sites/content_shows_sj.py b/feedcrawler/external_sites/feed_search/sites/content_shows_sj.py
@@ -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": ""
         }))
@@ -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:

diff --git a/feedcrawler/external_sites/web_search/content_shows.py b/feedcrawler/external_sites/web_search/content_shows.py
@@ -352,6 +352,7 @@ def download(payload):
 
     notify_array = []
     for title in matches:
+        title = title.rstrip('.')
         size = ""
         incomplete = False
 

diff --git a/feedcrawler/web_interface/vuejs_frontend/src/components/Head.vue b/feedcrawler/web_interface/vuejs_frontend/src/components/Head.vue
@@ -114,8 +114,6 @@ function showSiteStatusHelp() {
     toggle: true
   })
 }
-
-import Captcha from './Captcha.vue'
 </script>
 
 

diff --git a/feedcrawler/web_interface/vuejs_frontend/src/components/MyJD.vue b/feedcrawler/web_interface/vuejs_frontend/src/components/MyJD.vue
@@ -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
@@ -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">
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,8 +114,6 @@ function showSiteStatusHelp() { @@
         toggle: true
       })
     }
-    import Captcha from './Captcha.vue'
     </script>
@@ Expand Down @@