fix: URL item duration unit in seconds, bad skip button in floating player

This commit is contained in:
Terry Geng
2020-05-18 00:07:56 +08:00
parent 0b7d0b8465
commit 1d97fe654e
4 changed files with 18 additions and 11 deletions

View File

@ -194,7 +194,7 @@ class Condition:
SETTING_DB_VERSION = 2
MUSIC_DB_VERSION = 3
MUSIC_DB_VERSION = 4
class SettingsDatabase:
@ -504,7 +504,10 @@ class DatabaseMigration:
1: self.settings_table_migrate_from_1_to_2}
self.music_table_migrate_func = {0: self.music_table_migrate_from_0_to_1,
1: self.music_table_migrate_from_1_to_2,
2: self.music_table_migrate_from_2_to_3}
2: self.music_table_migrate_from_2_to_4,
3: self.music_table_migrate_from_2_to_4
}
def migrate(self):
self.settings_database_migrate()
@ -565,7 +568,7 @@ class DatabaseMigration:
else:
log.info(f"database: no music table found. Creating music table version {MUSIC_DB_VERSION}.")
self.create_music_table_version_3(conn)
self.create_music_table_version_4(conn)
conn.commit()
conn.close()
@ -608,7 +611,7 @@ class DatabaseMigration:
conn.commit()
def create_music_table_version_3(self, conn):
def create_music_table_version_4(self, conn):
self.create_music_table_version_1(conn)
def settings_table_migrate_from_0_to_1(self, conn):
@ -671,13 +674,15 @@ class DatabaseMigration:
return 2 # return new version number
def music_table_migrate_from_2_to_3(self, conn):
def music_table_migrate_from_2_to_4(self, conn):
items_to_update = self.music_db.query_music(Condition(), conn)
for item in items_to_update:
if 'duration' not in item:
item['duration'] = 0
if item['type'] == 'url' or item['type'] == "url_from_playlist":
item['duration'] = item['duration'] * 60
self.music_db.insert_music(item)
conn.commit()
return 3 # return new version number
return 4 # return new version number