Fix for #31

- Path naming issues fixed for a movie, should close #31 - Updated Pypi key for this project in TravisCI config.
Xonshiz · Jun 7, 2021 · 9e45992 · 9e45992
1 parent e769dcc
commit 9e45992
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,7 @@ matrix:
           edge:
             branch: v1.8.45
           username: xonshiz
-          password:
-            secure: lHfaeruvQM4QL3hk1+wSwVSNjkeQH153X9Oi+nY1SaahjEg1l9mNaubfq7l8mNRgbZzW3yOHswDOLz6bNlSKX9xnjecl/5jVOg97ImChujtwZobGmCJuSBq+F2HGt3KnJefjgv2E/kAMgKPLJJSZHIGzxaYDLyRiz8hr6aMdPFEU8rY8Ha4OpHOCjQrZOULgUYQs/UR2FzjI6QhIqHOlc+reZbtADI9Z69i16iTXf+isAFgwEW+Na/uxODT3kXgt5HXxNayODPlMCVBABfWyDajoeJFmYE90hggPI3FmBn9rapTEIJMMDhT5Sh/T7lIVgyJGBA6eT4lBiEPgB4CS8Vbh6nW00RjrgYWMDPMpxqNA3hBCRsQ1zpOQc5idH8yxS2Y+7GxwWqcqmGiuvE0/a0ytU5vDeM+VkjSN1irFEW1tAPjMNHLK8aPDDteu0qCyhDK17W4NOuZ8DQgxjvPwsSIElQOTnEy4UdXNkcQa8rnPIHnHa0ceoOZI1gYdn/xlrKcmXmGSGCi4KBpo1bQ1fC6QnHleKsognpNAr4diJxgqDjRMUmcfQOWW8c2hji2xUH34amvVMZVpbJu1zkM/o8I7upaAjwE6H/s7Azo2X/sKYyH0uJDeWYrTHofp9M3yWJKJQ3/nqzG8Ete9caZBbKcj0pb6RXdJ8iAR4JLUDJE=
+          password: $PYPI_TOKEN
           distributions: "sdist bdist_wheel"
           on:
             branch: master

diff --git a/Changelog.md b/Changelog.md
@@ -11,4 +11,5 @@
 - Fix for #29 and #28
 - Fix for #25
 - Fix for #31
-- Subtitles will now show proper language names instead of 'en', 'es', etc.
+- Subtitles will now show proper language names instead of 'en', 'es', etc.
+- Fix for path naming issues #31
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -11,4 +11,5 @@
 - Fix for #29 and #28
 - Fix for #25
 - Fix for #31
-- Subtitles will now show proper language names instead of 'en', 'es', etc.
+- Subtitles will now show proper language names instead of 'en', 'es', etc.
+- Fix for path naming issues #31
diff --git a/hulusubs_dl/__version__.py b/hulusubs_dl/__version__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "2021.06.07"
+__version__ = "2021.06.07_1"
diff --git a/hulusubs_dl/hulu.py b/hulusubs_dl/hulu.py
@@ -73,8 +73,11 @@ def episode_link(self, url, cookie_value, language, extension, download_location
                         url = str(dict(selected_extension).get(language, None)).strip()
                         logging.debug('subtitle url eab_id: {0}'.format(url))
                         subtitle_content = browser_instance.get_request(url, cookie_value, text_only=True)
-                        path_created = path_util.create_paths(
-                            download_location + os.sep + series_name + os.sep + season_number)
+                        path_created = False
+                        if is_movie:
+                            path_created = path_util.create_paths(download_location + os.sep + series_name)
+                        else:
+                            path_created = path_util.create_paths(download_location + os.sep + series_name + os.sep + season_number)
                         if path_created:
                             if extension == 'srt':
                                 subtitle_content = subtitle_processing.convert_content(subtitle_content.decode('utf-8')).encode('utf-8')