Skip to content
This repository has been archived by the owner on Nov 12, 2018. It is now read-only.

Commit

Permalink
Bug fix for #13
Browse files Browse the repository at this point in the history 
Queued files are now redownloaded if deleted by "SaveVideos = no".
  • Loading branch information
TBK committed May 15, 2017
1 parent abb6882 commit f568aec
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 79 deletions.
3 changes: 3 additions & 0 deletions musicbot/bot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,9 @@ async def deserialize_queue(self,

with open(dir, 'r', encoding='utf8') as file_:
data = file_.read()

if self.config.save_videos is False:
data = re.sub('"downloaded": true,', '"downloaded": false,', data)

return Player.from_json(data, self, voice_client, playlist)

Expand Down
159 changes: 80 additions & 79 deletions musicbot/entry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,14 @@ def __init__(self,

def __json__(self):
return self._enclose_json({
'version': 1,
'version': 2,
'url': self.url,
'title': self.title,
'duration': self.duration,
'start_seconds': self.start_seconds,
'downloaded': self.is_downloaded,
'expected_filename': self.expected_filename,
'filename': self.filename,
'full_filename': os.path.abspath(self.filename)
if self.filename else self.filename,
'filename_thumbnail': self.filename_thumbnail,
'meta': {
name: {
Expand Down Expand Up @@ -166,7 +164,7 @@ def _deserialize(cls, data, playlist=None):

return entry
except Exception as error:
LOG.error("Could not load %s", cls.__name__, exc_info=error)
LOG.error('Could not load %s', cls.__name__, exc_info=error)

# noinspection PyTypeChecker
async def _download(self):
Expand All @@ -179,82 +177,87 @@ async def _download(self):
if not os.path.exists(self.download_folder):
os.makedirs(self.download_folder)

if self.expected_filename is None:
LOG.debug("Entry: Something is wrong - self.expected_filename is None!")
raise Exception

# self.expected_filename:
# audio_cache\youtube-9R8aSKwTEMg-NOMA_-_Brain_Power.m4a
extractor = os.path.basename(self.expected_filename).split('-')[0]

# the generic extractor requires special handling
if extractor == 'generic':
LOG.debug("Handling generic")
# remove thumbnail images from list
img_pattern = re.compile(
r'(\.(jpg|jpeg|png|gif|bmp))$', flags=re.IGNORECASE)
flistdir = [f.rsplit('-', 1)[0] for f in
os.listdir(self.download_folder)
if not img_pattern.search(f)]
expected_fname_noex = os.path.basename(
self.expected_filename).rsplit('.', 1)

if expected_fname_noex in flistdir:
try:
rsize = int(await get_header(
self.playlist.bot.aiosession,
self.url, 'CONTENT-LENGTH'))
except:
rsize = 0

lfile = os.path.join(
self.download_folder,
os.listdir(self.download_folder)[
flistdir.index(expected_fname_noex)]
)

LOG.debug("Resolved %s to %s", self.expected_filename, lfile)
lsize = os.path.getsize(lfile)
LOG.debug("Remote size: %s Local size: %s", rsize, lsize)

if lsize != rsize:
await self._really_download(hash=True)
if self.expected_filename:
# self.expected_filename:
# audio_cache\youtube-9R8aSKwTEMg-NOMA_-_Brain_Power.m4a
extractor = os.path.basename(self.expected_filename).split('-')[0]
# if os.name == 'nt':
# extractor = (self.expected_filename.split('-')[0]).rsplit('\\', 1)[-1]
# else:
# extractor = (self.expected_filename.split('-')[0]).rsplit('/', 1)[-1]

# the generic extractor requires special handling
if extractor == 'generic':
LOG.debug('Handling generic')
# remove thumbnail images from list
img_pattern = re.compile(
r'(\.(jpg|jpeg|png|gif|bmp))$', flags=re.IGNORECASE)
flistdir = [f.rsplit('-', 1)[0] for f in
os.listdir(self.download_folder)
if not img_pattern.search(f)]
expected_fname_noex = os.path.basename(
self.expected_filename).rsplit('.', 1)

if expected_fname_noex in flistdir:
try:
rsize = int(await get_header(
self.playlist.bot.aiosession,
self.url, 'CONTENT-LENGTH'))
except:
rsize = 0

lfile = os.path.join(
self.download_folder,
os.listdir(self.download_folder)[
flistdir.index(expected_fname_noex)]
)

LOG.debug('Resolved %s to %s', self.expected_filename, lfile)
lsize = os.path.getsize(lfile)
LOG.debug('Remote size: %s Local size: %s', rsize, lsize)

if lsize != rsize:
await self._really_download(hash=True)
else:
LOG.debug('[Download] Cached: %s', self.url)
self.filename = lfile

else:
LOG.debug("[Download] Cached: %s", self.url)
self.filename = lfile
LOG.debug('File not found in cache (%s)', expected_fname_noex)
await self._really_download(hash=True)

else:
LOG.debug("File not found in cache (%s)", expected_fname_noex)
await self._really_download(hash=True)

img_pattern = re.compile(
r'(\.(jpg|jpeg|png|gif|bmp))$', flags=re.IGNORECASE)
ldir = [f for f in os.listdir(
self.download_folder) if not img_pattern.search(f)]
flistdir = [f.rsplit('.', 1)[0] for f in ldir]
expected_fname_base = os.path.basename(self.expected_filename)
expected_fname_noex = expected_fname_base.rsplit('.', 1)[0]

# idk wtf this is but its probably legacy code
# or i have youtube to blame for changing shit again
if expected_fname_base in ldir:
self.filename = os.path.join(
self.download_folder, expected_fname_base)
LOG.info('Download cached: %s', self.url)

elif expected_fname_noex in flistdir:
LOG.info(
'Download cached (different extension): %s', self.url)
self.filename = os.path.join(
self.download_folder,
ldir[flistdir.index(expected_fname_noex)])
LOG.debug('Expected %s, got %s',
self.expected_filename.rsplit('.', 1)[-1],
self.filename.rsplit('.', 1)[-1]
)
else:
await self._really_download()
else:
img_pattern = re.compile(
r'(\.(jpg|jpeg|png|gif|bmp))$', flags=re.IGNORECASE)
ldir = [f for f in os.listdir(
self.download_folder) if not img_pattern.search(f)]
flistdir = [f.rsplit('.', 1)[0] for f in ldir]
expected_fname_base = os.path.basename(self.expected_filename)
expected_fname_noex = expected_fname_base.rsplit('.', 1)[0]

# idk wtf this is but its probably legacy code
# or i have youtube to blame for changing shit again
if expected_fname_base in ldir:
self.filename = os.path.join(
self.download_folder, expected_fname_base)
LOG.info("Download cached: %s", self.url)

elif expected_fname_noex in flistdir:
LOG.info(
"Download cached (different extension): %s", self.url)
self.filename = os.path.join(
self.download_folder,
ldir[flistdir.index(expected_fname_noex)])
LOG.debug("Expected %s, got %s",
self.expected_filename.rsplit('.', 1)[-1],
self.filename.rsplit('.', 1)[-1]
)
else:
await self._really_download()
# For cases where Config - SaveVideos = no and the bot resumes after a restart.
LOG.debug('Config - SaveVideos = no: Downloading the song again!')
await self._really_download()

# Trigger ready callbacks.
self._for_each_future(lambda future: future.set_result(self))
Expand Down Expand Up @@ -288,9 +291,7 @@ async def _really_download(self, *, hash=False):

# Search for file name with an image suffix
img_pattern = re.compile(
self.filename.lstrip(self.download_folder + os.sep)
.rsplit('.', 1)[0] +
r'(\.(jpg|jpeg|png|gif|bmp))$', re.IGNORECASE)
r'(\.(jpg|jpeg|png|gif|bmp))$', flags=re.IGNORECASE)
self.filename_thumbnail = next(
os.path.join(self.download_folder, f)
for f in os.listdir(self.download_folder) if img_pattern.search(f))
Expand Down

0 comments on commit f568aec

Please sign in to comment.