update old App name refs to FireDM, issue firedm#221

Author: firedm

firedm/about.py

@@ -22,9 +22,9 @@
 ------------------------------------------------------------------------
 
 your feedback is most welcomed on:
-https://github.com/pyIDM/FireDM
+https://github.com/firedm/FireDM
 email: [email protected]
 
 Author,
 Mahmoud Elshahat
-2019-2020"""
+2019-2021"""

firedm/config.py

@@ -39,8 +39,8 @@
 # minimum segment size which can be split in 2 halves in auto-segmentation process, refer to brain.py>thread_manager.
 DEFAULT_SEGMENT_SIZE = 204800  # 204800 bytes == 200 KB
 DEFAULT_CONCURRENT_CONNECTIONS = 3
-APP_URL = 'https://github.com/pyIDM/FireDM'
-LATEST_RELEASE_URL = 'https://github.com/pyIDM/FireDM/releases/latest'
+APP_URL = 'https://github.com/firedm/FireDM'
+LATEST_RELEASE_URL = 'https://github.com/firedm/FireDM/releases/latest'
 
 # headers,
 DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3721.3'

firedm/controller.py

@@ -501,7 +501,7 @@ def newfunc(obj, *args, **kwargs):
             # handle types: url and url transparent
             if _type in ('url', 'url_transparent'):
                 # handle youtube user links ex: https://www.youtube.com/c/MOTORIZADO/videos
-                # issue: https://github.com/pyIDM/FireDM/issues/146
+                # issue: https://github.com/firedm/FireDM/issues/146
                 # info: {'_type': 'url', 'url': 'https://www.youtube.com/playlist?list=UUK32F9z7s_JhACkUdVoWdag',
                 # 'ie_key': 'YoutubePlaylist', 'extractor': 'youtube:user', 'webpage_url': 'https://www.youtube.com/c/MOTORIZADO/videos',
                 # 'webpage_url_basename': 'videos', 'extractor_key': 'YoutubeUser'}
@@ -1041,10 +1041,10 @@ def _download_ffmpeg(self, destination=config.sett_folder):
         # ends with 86 for 32 bit and 64 for 64 bit i.e. Win7-64: AMD64 and Vista-32: x86
         if platform.machine().endswith('64'):
             # 64 bit link
-            url = 'https://github.com/pyIDM/PyIDM/releases/download/extra/ffmpeg_64bit.exe'
+            url = 'https://github.com/firedm/FireDM/releases/download/extra/ffmpeg_64bit.exe'
         else:
             # 32 bit link
-            url = 'https://github.com/pyIDM/PyIDM/releases/download/extra/ffmpeg_32bit.exe'
+            url = 'https://github.com/firedm/FireDM/releases/download/extra/ffmpeg_32bit.exe'
 
         log('downloading: ', url)
 
@@ -1162,7 +1162,7 @@ def fetch_pypi(pkg):
                 log('getting FireDM changelog ....')
 
                 # download change log file
-                url = 'https://github.com/pyIDM/pyIDM/raw/master/ChangeLog.txt'
+                url = 'https://github.com/firedm/FireDM/raw/master/ChangeLog.txt'
                 buffer = download(url, verbose=False)  # get BytesIO object
 
                 if buffer:

firedm/model.py

@@ -46,7 +46,7 @@ def setter(self, super_class, key, value):
         except:
             old_value = None
 
-        # normalize folder path https://github.com/pyIDM/FireDM/issues/185
+        # normalize folder path https://github.com/firedm/FireDM/issues/185
         if key == 'folder':
             value = os.path.normpath(value)
 

firedm/setting.py

@@ -71,11 +71,11 @@ def locate_setting_folder():
 
         # for compatibility with old project name 'PyIDM', will copy sett. files from old location
         if config.current_directory != config.global_sett_folder:
-            pyidm_cfg_folder = config.global_sett_folder.replace('FireDM', 'PyIDM')
-            log('found settings files in old application folder:', pyidm_cfg_folder)
-            if os.path.isfile(os.path.join(pyidm_cfg_folder, 'setting.cfg')):
-                for filename in os.listdir(pyidm_cfg_folder):
-                    filepath = os.path.join(pyidm_cfg_folder, filename)
+            old_cfg_folder = config.global_sett_folder.replace('FireDM', 'PyIDM')
+            log('found settings files in old application folder:', old_cfg_folder)
+            if os.path.isfile(os.path.join(old_cfg_folder, 'setting.cfg')):
+                for filename in os.listdir(old_cfg_folder):
+                    filepath = os.path.join(old_cfg_folder, filename)
                     shutil.copy(filepath, setting_folder)
                     log('copied file:', filepath, 'to:', setting_folder)
 
@@ -261,4 +261,8 @@ def save_setting():
             json.dump(settings, f)
             log('setting saved in:', file)
     except Exception as e:
-        log('save_setting() > error', e)
+        log('save_setting() > error', e)
+
+
+
+

firedm/tkview.py

@@ -3782,9 +3782,9 @@ def schedule(self, uid=None, video_idx=None):
     def show_about_notes(self):
         res = self.popup(about_notes, buttons=['Home', 'Help!', 'Close'], title='About FireDM')
         if res == 'Help!':
-            open_webpage('https://github.com/pyIDM/PyIDM/blob/master/docs/user_guide.md')
+            open_webpage('https://github.com/firedm/FireDM/blob/master/docs/user_guide.md')
         elif res == 'Home':
-            open_webpage('https://github.com/pyIDM/PyIDM/')
+            open_webpage('https://github.com/firedm/FireDM')
 
     @busy_callback
     def check_for_update(self):

firedm/update.py

@@ -67,7 +67,7 @@ def check_for_new_version():
             log('Found new version:', str(latest_version))
 
             # download change log file
-            url = 'https://github.com/pyIDM/FireDM/raw/master/ChangeLog.txt'
+            url = 'https://github.com/firedm/FireDM/raw/master/ChangeLog.txt'
             buffer = download(url, verbose=False)  # get BytesIO object
 
             if buffer:

firedm/video.py

@@ -877,7 +877,7 @@ def download_m3u8(url, http_headers=config.http_headers):
 def parse_subtitles(m3u8_doc, m3u8_url):
     # check subtitles in master m3u8, for some reasons youtube-dl doesn't recognize subtitles in m3u8 files
     # link: https://www.dplay.co.uk/show/ghost-loop/video/dead-and-breakfast/EHD_297528B
-    # github issue: https://github.com/pyIDM/FireDM/issues/77
+    # github issue: https://github.com/firedm/FireDM/issues/77
     # if youtube-dl fixes this problem in future, there is no need for this batch
     subtitles = {}
     lines = m3u8_doc.splitlines()