Procházet zdrojové kódy

Convert all paths to windows or unix compatible systems (`os.abspath()`)

Deben Oldert před 6 roky
rodič
revize
1078681075
2 změnil soubory, kde provedl 7 přidání a 1 odebrání
  1. 3 0
      main.py
  2. 4 1
      sites/helper/download.py

+ 3 - 0
main.py

@@ -14,6 +14,8 @@ def init():
 
     Settings.tmpDir = os.path.expanduser(os.getenv('MD_TMP', '/tmp'))
 
+    os.makedirs(Settings.tmpDir, exist_ok=True)
+
     directory(os.getenv('MD_SAVEDIR', '~/Music/iTunes/iTunes Media/Automatically Add to iTunes'))
 
 
@@ -127,6 +129,7 @@ def directory(dir=None):
     if dir is None:
         dir = console.ask_input('Enter new save directory')
     Settings.SaveDir = os.path.expanduser(dir)
+    os.makedirs(Settings.SaveDir, exist_ok=True)
     console.output('New save directory: {0}'.format(Settings.SaveDir), level=console.DBG_INFO)
     return True
 

+ 4 - 1
sites/helper/download.py

@@ -1,4 +1,5 @@
 import console
+import os
 import sites.helper.tagging as tagging
 from sites.helper.item import Empty
 from .request import RawRequest
@@ -59,6 +60,8 @@ def download(item, type='GET', parameters=None, headers=None, cookies=None, stre
 
 
 def savefileprogress(name, full_name, file, item):
+    os.path.abspath(full_name)
+
     console.output('Saving to: {0}'.format(full_name), level=console.DBG_INFO)
     with open(full_name, 'wb') as f:
         progress = 0
@@ -85,7 +88,7 @@ def savefileprogress(name, full_name, file, item):
 
             tagging.write_tags_to_file(f, item)
 
-    full_save_name = '{0}/{1}'.format(Settings.SaveDir, name)
+    full_save_name = os.path.abspath('{0}/{1}'.format(Settings.SaveDir, name))
     os.rename(full_name, full_save_name)
     console.output('Moved to {0}'.format(full_save_name), level=console.DBG_INFO)